Merge pull request #31887 from gribozavr/regex-always-works

gribozavr · web-flow · commit 759a73e69f34 · 2020-05-19T21:15:07.000+02:00
Remove support for a broken std::regex in libstdc++ 4.8
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -560,9 +560,6 @@ if(XCODE)
   swift_common_xcode_cxx_config()
 endif()
 
-include(SwiftCheckCXXNativeRegex)
-check_cxx_native_regex(SWIFT_HAVE_WORKING_STD_REGEX)
-
 # If SWIFT_HOST_VARIANT_SDK not given, try to detect from the CMAKE_SYSTEM_NAME.
 if(SWIFT_HOST_VARIANT_SDK)
   set(SWIFT_HOST_VARIANT_SDK_default "${SWIFT_HOST_VARIANT_SDK}")
diff --git a/cmake/modules/SwiftCheckCXXNativeRegex.cmake b/cmake/modules/SwiftCheckCXXNativeRegex.cmake
diff --git a/include/swift/Config.h.in b/include/swift/Config.h.in
@@ -4,8 +4,6 @@
 #ifndef SWIFT_CONFIG_H
 #define SWIFT_CONFIG_H
 
-#cmakedefine SWIFT_HAVE_WORKING_STD_REGEX 1
-
 #cmakedefine HAVE_WAIT4 1
 
 #cmakedefine HAVE_PROC_PID_RUSAGE 1
diff --git a/lib/IDE/SyntaxModel.cpp b/lib/IDE/SyntaxModel.cpp
@@ -1509,7 +1509,6 @@ bool ModelASTWalker::processComment(CharSourceRange Range) {
 bool ModelASTWalker::findUrlStartingLoc(StringRef Text,
                                         unsigned &Start,
                                         std::regex &Regex) {
-#ifdef SWIFT_HAVE_WORKING_STD_REGEX
   static const auto MailToPosition = std::find(URLProtocols.begin(),
                                                URLProtocols.end(),
                                                "mailto");
@@ -1541,7 +1540,6 @@ bool ModelASTWalker::findUrlStartingLoc(StringRef Text,
       }
     }
   }
-#endif
   return false;
 }
 
diff --git a/test/IDE/coloring_comments.swift b/test/IDE/coloring_comments.swift
@@ -1,5 +1,4 @@
 // RUN: %target-swift-ide-test -syntax-coloring -source-filename %s | %FileCheck %s
-// XFAIL: broken_std_regex
 
 // CHECK: <comment-block>/* foo is the best */</comment-block>
 /* foo is the best */
diff --git a/test/SourceKit/CodeComplete/complete_crash1.swift b/test/SourceKit/CodeComplete/complete_crash1.swift
@@ -1,4 +1,3 @@
-// XFAIL: broken_std_regex
 // RUN: %complete-test -tok=TOK1 -hide-none %s
 
 import QuartzCore
diff --git a/test/SourceKit/CodeComplete/complete_filter.swift b/test/SourceKit/CodeComplete/complete_filter.swift
@@ -11,7 +11,6 @@ func foo() {
   x.#^FOO,,a,aa,ab,abc,abcd^#
 }
 
-// XFAIL: broken_std_regex
 // RUN: %sourcekitd-test -req=complete.open -pos=11:5 %s -- %s > %t.all
 // RUN: %FileCheck -check-prefix=CHECK-ALL %s < %t.all
 // CHECK-ALL: key.name: "aaa
diff --git a/test/SourceKit/CodeComplete/complete_fuzzy.swift b/test/SourceKit/CodeComplete/complete_fuzzy.swift
@@ -9,8 +9,6 @@ func footastic() {}
 
 // ===- Without a filter, we group.
 
-// XFAIL: broken_std_regex
-
 // RUN: %complete-test %s -group=stems -tok=TOP_LEVEL_NO_FILTER | %FileCheck %s -check-prefix=TOP_LEVEL_NO_FILTER
 // RUN: %complete-test %s -group=stems -fuzz -tok=TOP_LEVEL_NO_FILTER | %FileCheck %s -check-prefix=TOP_LEVEL_NO_FILTER
 func test1() {
diff --git a/test/SourceKit/CodeComplete/complete_group_overloads.swift b/test/SourceKit/CodeComplete/complete_group_overloads.swift
@@ -1,5 +1,3 @@
-// XFAIL: broken_std_regex
-
 struct A {}
 struct B {}
 
diff --git a/test/SourceKit/CodeComplete/complete_import_module_flag.swift b/test/SourceKit/CodeComplete/complete_import_module_flag.swift
@@ -1,4 +1,3 @@
-// XFAIL: broken_std_regex
 // RUN: %empty-directory(%t)
 // RUN: %swift -Xcc -I%S/Inputs -emit-module -o %t/auxiliary_file.swiftmodule %S/Inputs/auxiliary_file.swift
 // RUN: %complete-test -group=none -hide-none -raw -tok=TOP_LEVEL_0 %s -- -Xfrontend -import-module -Xfrontend auxiliary_file  -I %t -I %S/Inputs | %FileCheck %s
diff --git a/test/SourceKit/CodeComplete/complete_inner.swift b/test/SourceKit/CodeComplete/complete_inner.swift
@@ -1,5 +1,3 @@
-// XFAIL: broken_std_regex
-
 class Foo {}
 class Base {
   init() {}
@@ -30,18 +28,18 @@ func test010(x: E1, y: FooBar) {
   }
 }
 
-// RUN: %sourcekitd-test -req=complete.open -pos=26:11 -req-opts=filtertext=on %s -- %s | %FileCheck %s -check-prefix=INNER_POSTFIX_0a
+// RUN: %sourcekitd-test -req=complete.open -pos=24:11 -req-opts=filtertext=on %s -- %s | %FileCheck %s -check-prefix=INNER_POSTFIX_0a
 // INNER_POSTFIX_0a-NOT: key.description: "one{{.+}}"
 // INNER_POSTFIX_0a: key.description: "one",{{$}}
 // INNER_POSTFIX_0a-NOT: key.description: "one{{.+}}"
 
-// RUN: %sourcekitd-test -req=complete.open -pos=26:11 -req-opts=filtertext=one %s -- %s | %FileCheck %s -check-prefix=INNER_POSTFIX_0b
+// RUN: %sourcekitd-test -req=complete.open -pos=24:11 -req-opts=filtertext=one %s -- %s | %FileCheck %s -check-prefix=INNER_POSTFIX_0b
 // INNER_POSTFIX_0b-NOT: key.description: "one{{.+}}"
 // INNER_POSTFIX_0b: key.description: "one",{{$}}
 // INNER_POSTFIX_0b: key.description: "one.",{{$}}
 // INNER_POSTFIX_0b-NOT: key.description: "one{{.+}}"
 
-// RUN: %sourcekitd-test -req=complete.open -pos=29:9 -req-opts=filtertext=pro %s -- %s | %FileCheck %s -check-prefix=INNER_POSTFIX_1
+// RUN: %sourcekitd-test -req=complete.open -pos=27:9 -req-opts=filtertext=pro %s -- %s | %FileCheck %s -check-prefix=INNER_POSTFIX_1
 // INNER_POSTFIX_1-NOT: key.description: "prop{{.+}}"
 // INNER_POSTFIX_1: key.description: "prop",{{$}}
 // INNER_POSTFIX_1-NOT: key.description: "prop{{.+}}"
diff --git a/test/SourceKit/CodeComplete/complete_literals.swift b/test/SourceKit/CodeComplete/complete_literals.swift
@@ -1,7 +1,6 @@
 ()
 let var1 = 1
 let var2: Int = 1
-// XFAIL: broken_std_regex
 // RUN: %sourcekitd-test -req=complete -pos=1:2 %s -- %s | %FileCheck %s -check-prefix=COMPLETE_1
 // RUN: %sourcekitd-test -req=complete -pos=2:12 %s -- %s | %FileCheck %s -check-prefix=COMPLETE_1
 // RUN: %sourcekitd-test -req=complete -pos=3:17 %s -- %s | %FileCheck %s -check-prefix=COMPLETE_2
diff --git a/test/SourceKit/CodeComplete/complete_moduleimportdepth.swift b/test/SourceKit/CodeComplete/complete_moduleimportdepth.swift
@@ -5,7 +5,6 @@ func test() {
   #^A^#
 }
 
-// XFAIL: broken_std_regex
 // REQUIRES: objc_interop
 // RUN: %complete-test -hide-none -group=none -tok=A %s -raw -- -I %S/Inputs -F %S/../Inputs/libIDE-mock-sdk > %t
 // RUN: %FileCheck %s < %t
diff --git a/test/SourceKit/CodeComplete/complete_name.swift b/test/SourceKit/CodeComplete/complete_name.swift
@@ -1,4 +1,3 @@
-// XFAIL: broken_std_regex
 // RUN: %complete-test -raw -tok=INIT_NAME %s | %FileCheck %s -check-prefix=INIT_NAME
 // RUN: %complete-test -raw -tok=METHOD_NAME %s | %FileCheck %s -check-prefix=METHOD_NAME
 
diff --git a/test/SourceKit/CodeComplete/complete_operators.swift b/test/SourceKit/CodeComplete/complete_operators.swift
@@ -1,4 +1,3 @@
-// XFAIL: broken_std_regex
 // RUN: %complete-test -tok=INT_OPERATORS %s | %FileCheck %s
 // RUN: %complete-test -add-inner-results -tok=INT_OPERATORS_INNER %s | %FileCheck %s -check-prefix=INNER
 // RUN: %complete-test -raw -hide-none -tok=INT_OPERATORS %s | %FileCheck %s -check-prefix=RAW
diff --git a/test/SourceKit/CodeComplete/complete_requestlimit.swift b/test/SourceKit/CodeComplete/complete_requestlimit.swift
@@ -1,5 +1,3 @@
-// XFAIL: broken_std_regex
-
 struct A {}
 struct B {
   let a: A
diff --git a/test/SourceKit/CodeComplete/complete_sort_order.swift b/test/SourceKit/CodeComplete/complete_sort_order.swift
@@ -7,7 +7,6 @@ func test() {
 
 }
 
-// XFAIL: broken_std_regex
 // RUN: %sourcekitd-test -req=complete -req-opts=hidelowpriority=0 -pos=7:1 %s -- %s > %t.orig
 // RUN: %sourcekitd-test -req=complete -req-opts=hidelowpriority=0,sort.byname=0 -pos=7:1 %s -- %s > %t.orig.off
 // RUN: %FileCheck -check-prefix=NAME_SORTED %s < %t.orig
diff --git a/test/SourceKit/CodeComplete/complete_stems.swift b/test/SourceKit/CodeComplete/complete_stems.swift
@@ -1,5 +1,3 @@
-// XFAIL: broken_std_regex
-
 func aaaBbb() {}
 func aaaaBbb() {}
 func aaaCcc() {}
diff --git a/test/SourceKit/CodeComplete/complete_structure.swift b/test/SourceKit/CodeComplete/complete_structure.swift
@@ -1,4 +1,3 @@
-// XFAIL: broken_std_regex
 // RUN: %complete-test %s -group=none -fuzz -structure -tok=S1_DOT | %FileCheck %s -check-prefix=S1_DOT
 // RUN: %complete-test %s -group=none -add-inner-results -fuzz -structure -tok=S1_POSTFIX | %FileCheck %s -check-prefix=S1_POSTFIX
 // RUN: %complete-test %s -group=none -add-inner-results -fuzz -structure -tok=S1_POSTFIX_INIT | %FileCheck %s -check-prefix=S1_INIT
diff --git a/test/SourceKit/CodeComplete/complete_test.swift b/test/SourceKit/CodeComplete/complete_test.swift
@@ -48,5 +48,3 @@ struct ForDiff {
 func diff(x: ForDiff) {
   x.#^DIFF^#
 }
-
-// XFAIL: broken_std_regex
diff --git a/test/SourceKit/CodeComplete/complete_type_match.swift b/test/SourceKit/CodeComplete/complete_type_match.swift
@@ -1,4 +1,3 @@
-// XFAIL: broken_std_regex
 // RUN: %complete-test -top=0 -tok=TOP_LEVEL_0 %s | %FileCheck %s -check-prefix=TOP_LEVEL_0
 // RUN: %complete-test -top=0 -tok=TOP_LEVEL_1 %s | %FileCheck %s -check-prefix=TOP_LEVEL_1
 // RUN: %complete-test -top=0 -tok=TOP_LEVEL_2 %s | %FileCheck %s -check-prefix=TOP_LEVEL_2
diff --git a/test/SourceKit/SyntaxMapData/syntaxmap.swift b/test/SourceKit/SyntaxMapData/syntaxmap.swift
@@ -1,3 +1,2 @@
-// XFAIL: broken_std_regex
 // RUN: %sourcekitd-test -req=syntax-map %S/Inputs/syntaxmap.swift > %t.response
 // RUN: %diff -u %s.response %t.response
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
@@ -89,9 +89,6 @@ if "@SWIFT_OPTIMIZED@" == "TRUE":
 if "@SWIFT_STDLIB_USE_NONATOMIC_RC@" == "TRUE":
     config.available_features.add("nonatomic_rc")
 
-if "@SWIFT_HAVE_WORKING_STD_REGEX@" == "FALSE":
-    config.available_features.add('broken_std_regex')
-
 if "@SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS@" == "TRUE":
     config.available_features.add('runtime_function_counters')
 

Original file line number	Diff line number	Diff line change
`@@ -1509,7 +1509,6 @@ bool ModelASTWalker::processComment(CharSourceRange Range) {`
`1509`	`1509`	`bool ModelASTWalker::findUrlStartingLoc(StringRef Text,`
`1510`	`1510`	`unsigned &Start,`
`1511`	`1511`	`std::regex &Regex) {`
`1512`		`-#ifdef SWIFT_HAVE_WORKING_STD_REGEX`
`1513`	`1512`	`static const auto MailToPosition = std::find(URLProtocols.begin(),`
`1514`	`1513`	`URLProtocols.end(),`
`1515`	`1514`	`"mailto");`
`@@ -1541,7 +1540,6 @@ bool ModelASTWalker::findUrlStartingLoc(StringRef Text,`
`1541`	`1540`	`}`
`1542`	`1541`	`}`
`1543`	`1542`	`}`
`1544`		`-#endif`
`1545`	`1543`	`return false;`
`1546`	`1544`	`}`
`1547`	`1545`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %target-swift-ide-test -syntax-coloring -source-filename %s \| %FileCheck %s`
`2`		`-// XFAIL: broken_std_regex`
`3`	`2`
`4`	`3`	`// CHECK: <comment-block>/* foo is the best */</comment-block>`
`5`	`4`	`/* foo is the best */`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// XFAIL: broken_std_regex`
`2`	`1`	`// RUN: %complete-test -tok=TOK1 -hide-none %s`
`3`	`2`
`4`	`3`	`import QuartzCore`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ func foo() {`
`11`	`11`	`x.#^FOO,,a,aa,ab,abc,abcd^#`
`12`	`12`	`}`
`13`	`13`
`14`		`-// XFAIL: broken_std_regex`
`15`	`14`	`// RUN: %sourcekitd-test -req=complete.open -pos=11:5 %s -- %s > %t.all`
`16`	`15`	`// RUN: %FileCheck -check-prefix=CHECK-ALL %s < %t.all`
`17`	`16`	`// CHECK-ALL: key.name: "aaa`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// XFAIL: broken_std_regex`
`2`		`-`
`3`	`1`	`struct A {}`
`4`	`2`	`struct B {}`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// XFAIL: broken_std_regex`
`2`	`1`	`// RUN: %empty-directory(%t)`
`3`	`2`	`// RUN: %swift -Xcc -I%S/Inputs -emit-module -o %t/auxiliary_file.swiftmodule %S/Inputs/auxiliary_file.swift`
`4`	`3`	`// RUN: %complete-test -group=none -hide-none -raw -tok=TOP_LEVEL_0 %s -- -Xfrontend -import-module -Xfrontend auxiliary_file -I %t -I %S/Inputs \| %FileCheck %s`