Merge pull request #42140 from artemcm/EnableRegexLiteralFlag

Add support for `-enable-regex-literals` flag

Author: artemcm

include/swift/Basic/LangOptions.h

@@ -561,6 +561,9 @@ namespace swift {
     /// Enables dumping type witness systems from associated type inference.
     bool DumpTypeWitnessSystems = false;
 
+    /// Enables `/.../` syntax regular-expression literals
+    bool EnableForwardSlashRegexLiterals = false;
+
     /// Sets the target we are building for and updates platform conditions
     /// to match.
     ///

include/swift/Option/Options.td

@@ -676,6 +676,10 @@ def disable_actor_data_race_checks :
   Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,
   HelpText<"Disable runtime checks for actor data races">;
 
+def enable_regex_literals : Flag<["-"], "enable-regex-literals">,
+  Flags<[FrontendOption, ModuleInterfaceOptionIgnorable]>,
+  HelpText<"Enable the use of regular-expression literals">;
+
 def warn_implicit_overrides :
   Flag<["-"], "warn-implicit-overrides">,
   Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,

lib/Driver/ToolChains.cpp

@@ -298,6 +298,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
                        options::OPT_verify_incremental_dependencies);
   inputArgs.AddLastArg(arguments, options::OPT_access_notes_path);
   inputArgs.AddLastArg(arguments, options::OPT_library_level);
+  inputArgs.AddLastArg(arguments, options::OPT_enable_regex_literals);
 
   // Pass on any build config options
   inputArgs.AddAllArgs(arguments, options::OPT_D);

lib/Frontend/CompilerInvocation.cpp

@@ -1004,6 +1004,9 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_disable_requirement_machine_reuse))
     Opts.EnableRequirementMachineReuse = false;
 
+  if (Args.hasArg(OPT_enable_regex_literals))
+    Opts.EnableForwardSlashRegexLiterals = true;
+
   if (Args.hasArg(OPT_enable_requirement_machine_opaque_archetypes))
     Opts.EnableRequirementMachineOpaqueArchetypes = true;
 

lib/Option/features.json

@@ -20,6 +20,9 @@
     },
     {
       "name": "empty-abi-descriptor"
-    }
+    },
+    {
+      "name": "enable-regex-literals"
+    }    
   ]
 }

test/Driver/enable_regex_literals_flag.swift

@@ -0,0 +1,8 @@
+// RUN: %target-swiftc_driver  -enable-regex-literals -disallow-use-new-driver -driver-print-jobs  %s 2>^1 | %FileCheck %s
+// The new driver has its own test for this
+// REQUIRES: cplusplus_driver
+// CHECK: {{.*}}/swift-frontend -frontend{{.*}}-enable-regex-literals
+
+public func foo() -> Int {
+    return 42
+}

test/ModuleInterface/option-preservation.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 
-// RUN: %target-swift-frontend -enable-library-evolution -emit-module-interface-path %t.swiftinterface -module-name t %s -target-min-inlining-version 42 -emit-module -o /dev/null -Onone -enforce-exclusivity=unchecked -autolink-force-load
+// RUN: %target-swift-frontend -enable-library-evolution -emit-module-interface-path %t.swiftinterface -module-name t %s -target-min-inlining-version 42 -emit-module -o /dev/null -Onone -enforce-exclusivity=unchecked -autolink-force-load -enable-regex-literals
 // RUN: %FileCheck %s < %t.swiftinterface -check-prefix=CHECK-SWIFTINTERFACE
 //
 // CHECK-SWIFTINTERFACE: swift-module-flags:
@@ -10,6 +10,7 @@
 // CHECK-SWIFTINTERFACE-SAME: -autolink-force-load
 // CHECK-SWIFTINTERFACE: swift-module-flags-ignorable:
 // CHECK-SWIFTINTERFACE-SAME: -target-min-inlining-version 42
+// CHECK-SWIFTINTERFACE-SAME: -enable-regex-literals
 
 // Make sure flags show up when filelists are enabled