Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -226,7 +226,7 @@ macro(swift_common_unified_build_config product)
   set(PATH_TO_LLVM_BUILD "${CMAKE_BINARY_DIR}")
   set(${product}_PATH_TO_CLANG_BUILD "${CMAKE_BINARY_DIR}")
   set(PATH_TO_CLANG_BUILD "${CMAKE_BINARY_DIR}")
-  set(CLANG_MAIN_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/tools/clang/include")
+  set(CLANG_MAIN_INCLUDE_DIR "${LLVM_EXTERNAL_CLANG_SOURCE_DIR}/include")
   set(CLANG_BUILD_INCLUDE_DIR "${CMAKE_BINARY_DIR}/tools/clang/include")
   set(${product}_NATIVE_LLVM_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")
   set(${product}_NATIVE_CLANG_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")
@@ -235,8 +235,8 @@ macro(swift_common_unified_build_config product)
 
   # If cmark was checked out into tools/cmark, expect to build it as
   # part of the unified build.
-  if(EXISTS "${CMAKE_SOURCE_DIR}/tools/cmark/")
-    set(${product}_PATH_TO_CMARK_SOURCE "${CMAKE_SOURCE_DIR}/tools/cmark")
+  if(EXISTS "${LLVM_EXTERNAL_CMARK_SOURCE_DIR}")
+    set(${product}_PATH_TO_CMARK_SOURCE "${LLVM_EXTERNAL_CMARK_SOURCE_DIR}")
     set(${product}_PATH_TO_CMARK_BUILD "${CMAKE_BINARY_DIR}/tools/cmark")
     set(${product}_CMARK_LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib")
 

include/swift/FrontendTool/FrontendTool.h

@@ -42,25 +42,6 @@ class FrontendObserver {
 
   /// The frontend has configured the compiler instance.
   virtual void configuredCompiler(CompilerInstance &instance);
-
-  /// The frontend has performed semantic analysis.
-  virtual void performedSemanticAnalysis(CompilerInstance &instance);
-
-  /// The frontend has performed basic SIL generation.
-  /// SIL diagnostic passes have not yet been applied.
-  virtual void performedSILGeneration(SILModule &module);
-
-  /// The frontend has executed the SIL diagnostic passes.
-  virtual void performedSILDiagnostics(SILModule &module);
-
-  /// The frontend has executed the SIL optimization pipeline.
-  virtual void performedSILOptimization(SILModule &module);
-
-  /// The frontend is about to run the program as an immediate script.
-  virtual void aboutToRunImmediately(CompilerInstance &instance);
-
-  // TODO: maybe enhance this interface to hear about IRGen and LLVM
-  // progress.
 };
 
 /// Perform all the operations of the frontend, exactly as if invoked

lib/FrontendTool/FrontendTool.cpp

@@ -960,9 +960,6 @@ static bool performCompile(CompilerInstance &Instance,
   if (Action == FrontendOptions::ActionType::ResolveImports)
     return Context.hadError();
 
-  if (observer)
-    observer->performedSemanticAnalysis(Instance);
-
   if (Stats)
     countStatsPostSema(*Stats, Instance);
 
@@ -1051,10 +1048,6 @@ static bool performMandatorySILPasses(CompilerInvocation &Invocation,
   } else if (!Invocation.getDiagnosticOptions().SkipDiagnosticPasses) {
     if (runSILDiagnosticPasses(*SM))
       return true;
-
-    if (observer) {
-      observer->performedSILDiagnostics(*SM);
-    }
   } else {
     // Even if we are not supposed to run the diagnostic passes, we still need
     // to run the ownership evaluator.
@@ -1154,9 +1147,6 @@ static bool processCommandLineAndRunImmediately(CompilerInvocation &Invocation,
       ProcessCmdLine(opts.ImmediateArgv.begin(), opts.ImmediateArgv.end());
   Instance.setSILModule(std::move(SM));
 
-  if (observer)
-    observer->aboutToRunImmediately(Instance);
-
   ReturnValue =
       RunImmediately(Instance, CmdLine, IRGenOpts, Invocation.getSILOptions());
   return Instance.getASTContext().hadError();
@@ -1243,9 +1233,6 @@ static bool performCompileStepsPostSILGen(
   SILOptions &SILOpts = Invocation.getSILOptions();
   IRGenOptions &IRGenOpts = Invocation.getIRGenOptions();
 
-  if (observer)
-    observer->performedSILGeneration(*SM);
-
   if (Stats)
     countStatsPostSILGen(*Stats, *SM);
 
@@ -1301,9 +1288,6 @@ static bool performCompileStepsPostSILGen(
 
   performSILOptimizations(Invocation, SM.get());
 
-  if (observer)
-    observer->performedSILOptimization(*SM);
-
   if (Stats)
     countStatsPostSILOpt(*Stats, *SM);
 
@@ -1873,8 +1857,3 @@ int swift::performFrontend(ArrayRef<const char *> Args,
 
 void FrontendObserver::parsedArgs(CompilerInvocation &invocation) {}
 void FrontendObserver::configuredCompiler(CompilerInstance &instance) {}
-void FrontendObserver::performedSemanticAnalysis(CompilerInstance &instance) {}
-void FrontendObserver::performedSILGeneration(SILModule &module) {}
-void FrontendObserver::performedSILDiagnostics(SILModule &module) {}
-void FrontendObserver::performedSILOptimization(SILModule &module) {}
-void FrontendObserver::aboutToRunImmediately(CompilerInstance &instance) {}

tools/swift-remoteast-test/swift-remoteast-test.cpp

@@ -178,7 +178,7 @@ printDynamicTypeAndAddressForExistential(void *object,
 namespace {
 
 struct Observer : public FrontendObserver {
-  void aboutToRunImmediately(CompilerInstance &instance) override {
+  void configuredCompiler(CompilerInstance &instance) override {
     Context = &instance.getASTContext();
   }
 };