[ASTGen] Move regex literal parsing from SwiftCompilerSources to ASTGen

ASTGen always builds with the host Swift compiler, without requiring
bootstrapping, and is enabled in more places. Move the regex literal
parsing logic there so it is enabled in more host environments, and
makes use of CMake's Swift support. Enable all of the regex literal
tests when ASTGen is built, to ensure everything is working.

Remove the "AST" and "Parse" Swift modules from SwiftCompilerSources,
because they are no longer needed.

Author: rintaro

SwiftCompilerSources/CMakeLists.txt

@@ -245,11 +245,8 @@ else()
 #define COMPILED_WITH_SWIFT
 
 #include \"Basic/BasicBridging.h\"
-#include \"AST/ASTBridging.h\"
 #include \"SIL/SILBridging.h\"
 #include \"SILOptimizer/OptimizerBridging.h\"
-
-#include \"Parse/RegexParserBridging.h\"
 ")
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp"

SwiftCompilerSources/Package.swift

@@ -67,39 +67,22 @@ let package = Package(
     .library(
       name: "swiftCompilerModules",
       type: .static,
-      targets: ["Basic", "AST", "Parse", "SIL", "Optimizer", "_CompilerRegexParser"]),
+      targets: ["Basic", "SIL", "Optimizer"]),
   ],
   dependencies: [
   ],
   // Note that targets and their dependencies must align with
   // 'SwiftCompilerSources/Sources/CMakeLists.txt'
   targets: [
-    .compilerModuleTarget(
-      name: "_CompilerRegexParser",
-      dependencies: [],
-      path: "_RegexParser_Sources",
-      swiftSettings: [
-        // Workaround until `_CompilerRegexParser` is imported as implementation-only
-        // by `_StringProcessing`.
-        .unsafeFlags([
-          "-Xfrontend",
-          "-disable-implicit-string-processing-module-import"
-        ])]),
     .compilerModuleTarget(
       name: "Basic",
       dependencies: []),
-    .compilerModuleTarget(
-      name: "AST",
-      dependencies: ["Basic"]),
-    .compilerModuleTarget(
-      name: "Parse",
-      dependencies: ["Basic", "AST", "_CompilerRegexParser"]),
     .compilerModuleTarget(
       name: "SIL",
       dependencies: ["Basic"]),
     .compilerModuleTarget(
       name: "Optimizer",
-      dependencies: ["Basic", "SIL", "Parse"]),
+      dependencies: ["Basic", "SIL"]),
   ],
   cxxLanguageStandard: .cxx17
 )

SwiftCompilerSources/Sources/AST/CMakeLists.txt

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import ASTBridging
+import BasicBridging
 
 public struct SourceLoc {
   /// Points into a source file.

SwiftCompilerSources/Sources/AST/DiagnosticEngine.swift

@@ -8,11 +8,6 @@
 
 # NOTE: Subdirectories must be added in dependency order.
 
-if(SWIFT_BUILD_REGEX_PARSER_IN_COMPILER)
-  add_subdirectory(_RegexParser)
-endif()
 add_subdirectory(Basic)
-add_subdirectory(AST)
-add_subdirectory(Parse)
 add_subdirectory(SIL)
 add_subdirectory(Optimizer)

SwiftCompilerSources/Sources/Basic/SourceLoc.swift

@@ -7,7 +7,7 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 set(dependencies)
-list(APPEND dependencies Basic SIL Parse)
+list(APPEND dependencies Basic SIL)
 
 add_swift_compiler_module(Optimizer DEPENDS ${dependencies})
 

SwiftCompilerSources/Sources/CMakeLists.txt

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import AST
 import SIL
 import OptimizerBridging
 
@@ -41,12 +40,6 @@ extension Context {
   }
 }
 
-extension Context {
-  var diagnosticEngine: DiagnosticEngine {
-    return DiagnosticEngine(bridged: _bridged.getDiagnosticEngine())
-  }
-}
-
 /// A context which allows mutation of a function's SIL.
 protocol MutatingContext : Context {
   // Called by all instruction mutations, including inserted new instructions.

SwiftCompilerSources/Sources/Optimizer/CMakeLists.txt

@@ -12,14 +12,12 @@
 
 import SIL
 import OptimizerBridging
-import Parse
 
 @_cdecl("initializeSwiftModules")
 public func initializeSwiftModules() {
   registerSILClasses()
   registerSwiftAnalyses()
   registerSwiftPasses()
-  initializeSwiftParseModules()
   registerOptimizerTests()
 }
 

SwiftCompilerSources/Sources/Optimizer/PassManager/Context.swift

@@ -13,9 +13,6 @@
 extern "C" {
 
 void initializeSwiftModules();
-void initializeSwiftParseModules();
-
 }
 
 void initializeSwiftModules() {}
-void initializeSwiftParseModules() {}

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -2073,13 +2073,6 @@ ERROR(expected_closure_literal,none,
 ERROR(expected_multiple_closures_block_rbrace,none,
       "expected '}' at the end of a trailing closures block", ())
 
-//------------------------------------------------------------------------------
-// MARK: diagnostics emitted by Swift libraries
-//------------------------------------------------------------------------------
-
-ERROR(foreign_diagnostic,none,
-      "%0", (StringRef))
-
 //------------------------------------------------------------------------------
 // MARK: macros
 //------------------------------------------------------------------------------

SwiftCompilerSources/Sources/Parse/CMakeLists.txt

@@ -18,7 +18,6 @@ extern "C" {
 #endif
 
 void initializeSwiftModules();
-void initializeSwiftParseModules();
 
 #ifdef __cplusplus
 }

SwiftCompilerSources/Sources/Parse/Parse.swift

@@ -134,6 +134,20 @@ swift::Stmt *_Nullable swift_ASTGen_buildStmt(
     BridgedASTContext astContext, BridgedLegacyParser legacyParser,
     BridgedSourceLoc *_Nonnull endSourceLoc);
 
+// MARK: - Regex parsing
+
+bool swift_ASTGen_lexRegexLiteral(const char *_Nonnull *_Nonnull curPtrPtr,
+                                  const char *_Nonnull bufferEndPtr,
+                                  bool mustBeRegex,
+                                  BridgedNullableDiagnosticEngine diagEngine);
+
+bool swift_ASTGen_parseRegexLiteral(BridgedStringRef inputPtr,
+                                    size_t *_Nonnull versionOut,
+                                    void *_Nonnull UnsafeMutableRawPointer,
+                                    size_t captureStructureSize,
+                                    BridgedSourceLoc diagLoc,
+                                    BridgedDiagnosticEngine diagEngine);
+
 #ifdef __cplusplus
 }
 #endif