[flang] Resolve merge with code pushed to master.

Original-commit: flang-compiler/f18@d75d86f28e9d1651fa6051e3700afeb48ba9c5d3
Reviewed-on: https://github.com/flang-compiler/f18/pull/34
Tree-same-pre-rewrite: false

diff --git a/flang/tools/f18/test-sema.cc b/flang/tools/f18/test-sema.cc
index 25325af..5ec3a6f 100644 (file)
--- a/flang/tools/f18/test-sema.cc
+++ b/flang/tools/f18/test-sema.cc
@@ -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;