[flang] Resolve merge with code pushed to master.

Original-commit: flang-compiler/f18@d75d86f28e
Reviewed-on: https://github.com/flang-compiler/f18/pull/34
Tree-same-pre-rewrite: false
This commit is contained in:
peter klausler 2018-03-28 15:11:12 -07:00
parent 75b29335ab
commit 448e3e4cca
1 changed files with 4 additions and 4 deletions

View File

@ -43,10 +43,10 @@ int main(int argc, char *const argv[]) {
ProvenanceRange range{allSources.AddIncludedFile(
*sourceFile, ProvenanceRange{})};
Messages messages{allSources};
CookedSource cooked{&allSources};
Preprocessor preprocessor{&allSources};
bool prescanOk{Prescanner{&messages, &cooked, &preprocessor}.Prescan(range)};
CookedSource cooked{allSources};
Messages messages{cooked};
Preprocessor preprocessor{allSources};
bool prescanOk{Prescanner{messages, cooked, preprocessor}.Prescan(range)};
messages.Emit(std::cerr);
if (!prescanOk) {
return EXIT_FAILURE;