Merge pull request #3872 from swiftwasm/maxd/main-merge

kateinoigakukun · web-flow · commit ef5952cffe55 · 2021-11-16T09:45:39.000+09:00
Resolve conflicts with upstream `main`
diff --git a/benchmark/single-source/ChaCha.swift b/benchmark/single-source/ChaCha.swift
@@ -363,7 +363,6 @@ func checkResult(_ plaintext: [UInt8]) {
 }
 
 @inline(never)
-@_assemblyVision
 public func run_ChaCha(_ n: Int) {
   let key = Array(repeating: UInt8(1), count: 32)
   let nonce = Array(repeating: UInt8(2), count: 12)
diff --git a/include/swift/AST/DiagnosticsParse.def b/include/swift/AST/DiagnosticsParse.def
@@ -107,6 +107,10 @@ ERROR(lex_unprintable_ascii_character,none,
       "unprintable ASCII character found in source file", ())
 ERROR(lex_invalid_utf8,none,
       "invalid UTF-8 found in source file", ())
+
+NOTE(lex_experimental_regex_strawperson,none,
+     "'%0'", (StringRef))
+
 ERROR(lex_single_quote_string,none,
       "single-quoted string literal found, use '\"'", ())
 ERROR(lex_invalid_curly_quote,none,
diff --git a/include/swift/Basic/LangOptions.h b/include/swift/Basic/LangOptions.h
@@ -144,6 +144,9 @@ namespace swift {
     /// PackageDescription version to compile for.
     version::Version PackageDescriptionVersion;
 
+    /// Enable experimental string processing
+    bool EnableExperimentalRegex = false;
+
     /// Disable API availability checking.
     bool DisableAvailabilityChecking = false;
 
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -469,6 +469,10 @@ def disable_deserialization_recovery :
   Flag<["-"], "disable-deserialization-recovery">,
   HelpText<"Don't attempt to recover from missing xrefs (etc) in swiftmodules">;
 
+def enable_experimental_regex :
+  Flag<["-"], "enable-experimental-regex">,
+  HelpText<"Enable experimental string processing">;
+
 def disable_availability_checking : Flag<["-"],
   "disable-availability-checking">,
   HelpText<"Disable checking for potentially unavailable APIs">;
diff --git a/include/swift/Parse/ExperimentalRegexBridging.h b/include/swift/Parse/ExperimentalRegexBridging.h
@@ -0,0 +1,20 @@
+#ifndef EXPERIMENTAL_REGEX_BRIDGING
+#define EXPERIMENTAL_REGEX_BRIDGING
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef const char *(* ParseRegexStrawperson)(const char *);
+
+void Parser_registerParseRegexStrawperson(ParseRegexStrawperson fn);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // EXPERIMENTAL_REGEX_BRIDGING
+
+
+//const char* experimental_regex_strawperson(const char *in);
+
diff --git a/include/swift/Parse/Lexer.h b/include/swift/Parse/Lexer.h
@@ -607,6 +607,15 @@ class Lexer {
   bool lexUnknown(bool EmitDiagnosticsIfToken);
 
   NulCharacterKind getNulCharacterKind(const char *Ptr) const;
+
+  /// Emit diagnostics for single-quote string and suggest replacement
+  /// with double-quoted equivalent.
+  ///
+  /// Or, if we're in strawperson mode, we will emit a custom
+  /// error message instead, determined by the Swift library.
+  void diagnoseSingleQuoteStringLiteral(const char *TokStart,
+                                        const char *TokEnd);
+
 };
 
 /// A lexer that can lex trivia into its pieces
diff --git a/include/swift/Runtime/ThreadLocalStorage.h b/include/swift/Runtime/ThreadLocalStorage.h
@@ -121,7 +121,8 @@ static_assert(std::is_same<__swift_thread_key_t, DWORD>::value,
 #  define SWIFT_THREAD_KEY_CREATE _stdlib_thread_key_create
 #  define SWIFT_THREAD_GETSPECIFIC _stdlib_thread_getspecific
 #  define SWIFT_THREAD_SETSPECIFIC _stdlib_thread_setspecific
-# else
+
+# elif !defined(SWIFT_STDLIB_SINGLE_THREADED_RUNTIME)
 // Otherwise use the pthread API.
 #  include <pthread.h>
 #  define SWIFT_THREAD_KEY_CREATE pthread_key_create
diff --git a/include/swift/module.modulemap b/include/swift/module.modulemap
@@ -8,3 +8,7 @@ module OptimizerBridging {
   export *
 }
 
+module ExperimentalRegexBridging {
+  header "Parse/ExperimentalRegexBridging.h"
+  export *
+}
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -471,6 +471,10 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
       = A->getOption().matches(OPT_enable_deserialization_recovery);
   }
 
+  // Experimental string processing
+  Opts.EnableExperimentalRegex |=
+      Args.hasArg(OPT_enable_experimental_regex);
+
   Opts.DisableAvailabilityChecking |=
       Args.hasArg(OPT_disable_availability_checking);
   Opts.CheckAPIAvailabilityOnly |=
diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
@@ -31,7 +31,8 @@ _swift_gyb_target_sources(swiftParse PRIVATE
 target_link_libraries(swiftParse PRIVATE
   swiftAST
   swiftSyntax
-  swiftSyntaxParse)
+  swiftSyntaxParse
+)
 
 add_dependencies(swiftParse swift-parse-syntax-generated-headers)
 
diff --git a/lib/Parse/Lexer.cpp b/lib/Parse/Lexer.cpp
@@ -30,6 +30,13 @@
 // FIXME: Figure out if this can be migrated to LLVM.
 #include "clang/Basic/CharInfo.h"
 
+// Regex parser delivered via libSwift
+#include "swift/Parse/ExperimentalRegexBridging.h"
+static ParseRegexStrawperson parseRegexStrawperson = nullptr;
+void Parser_registerParseRegexStrawperson(ParseRegexStrawperson fn) {
+  parseRegexStrawperson = fn;
+}
+
 #include <limits>
 
 using namespace swift;
@@ -1788,13 +1795,27 @@ static void validateMultilineIndents(const Token &Str,
 
 /// Emit diagnostics for single-quote string and suggest replacement
 /// with double-quoted equivalent.
-static void diagnoseSingleQuoteStringLiteral(const char *TokStart,
-                                             const char *TokEnd,
-                                             DiagnosticEngine *D) {
+///
+/// Or, if we're in experimental regex mode, we will emit a custom
+/// error message instead, determined by the Swift library.
+void Lexer::diagnoseSingleQuoteStringLiteral(const char *TokStart,
+                                             const char *TokEnd) {
   assert(*TokStart == '\'' && TokEnd[-1] == '\'');
-  if (!D)
+  if (!Diags) // or assert?
     return;
 
+  auto startLoc = Lexer::getSourceLoc(TokStart);
+  auto endLoc = Lexer::getSourceLoc(TokEnd);
+
+  if (LangOpts.EnableExperimentalRegex) {
+    if (parseRegexStrawperson) {
+      auto copy = std::string(TokStart, TokEnd-TokStart);
+      auto msg = parseRegexStrawperson(copy.c_str());
+      assert(msg != nullptr);
+      Diags->diagnose(startLoc, diag::lex_experimental_regex_strawperson, msg);
+    }
+  }
+
   SmallString<32> replacement;
   replacement.push_back('"');
   const char *Ptr = TokStart + 1;
@@ -1826,9 +1847,8 @@ static void diagnoseSingleQuoteStringLiteral(const char *TokStart,
   replacement.append(OutputPtr, Ptr - 1);
   replacement.push_back('"');
 
-  D->diagnose(Lexer::getSourceLoc(TokStart), diag::lex_single_quote_string)
-      .fixItReplaceChars(Lexer::getSourceLoc(TokStart),
-                         Lexer::getSourceLoc(TokEnd), replacement);
+  Diags->diagnose(startLoc, diag::lex_single_quote_string)
+      .fixItReplaceChars(startLoc, endLoc, replacement);
 }
 
 /// lexStringLiteral:
@@ -1895,7 +1915,7 @@ void Lexer::lexStringLiteral(unsigned CustomDelimiterLen) {
   if (QuoteChar == '\'') {
     assert(!IsMultilineString && CustomDelimiterLen == 0 &&
            "Single quoted string cannot have custom delimitor, nor multiline");
-    diagnoseSingleQuoteStringLiteral(TokStart, CurPtr, Diags);
+    diagnoseSingleQuoteStringLiteral(TokStart, CurPtr);
   }
 
   if (wasErroneous)
diff --git a/libswift/Sources/CMakeLists.txt b/libswift/Sources/CMakeLists.txt
@@ -6,5 +6,6 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
+add_subdirectory(ExperimentalRegex)
 add_subdirectory(SIL)
 add_subdirectory(Optimizer)
diff --git a/libswift/Sources/ExperimentalRegex/CMakeLists.txt b/libswift/Sources/ExperimentalRegex/CMakeLists.txt
@@ -0,0 +1,12 @@
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+add_libswift_module(ExperimentalRegex
+  Regex.swift
+)
+
diff --git a/libswift/Sources/ExperimentalRegex/Regex.swift b/libswift/Sources/ExperimentalRegex/Regex.swift
@@ -0,0 +1,20 @@
+import ExperimentalRegexBridging
+
+public func experimental_regex_strawperson(
+  _ ptr: UnsafePointer<CChar>?
+) -> UnsafePointer<CChar>? {
+  guard let s = ptr else { return nil }
+
+  let str = "Hello, \(String(cString:s))"
+  let count = str.utf8.count + 1
+  return str.withCString {
+    assert($0[count-1] == 0)
+    let ptr = UnsafeMutablePointer<CChar>.allocate(capacity: count)
+    ptr.initialize(from: $0, count: count)
+    return UnsafePointer(ptr)
+  }
+}
+
+public func registerParser() {
+  Parser_registerParseRegexStrawperson({ experimental_regex_strawperson($0) })
+}
diff --git a/libswift/Sources/Optimizer/CMakeLists.txt b/libswift/Sources/Optimizer/CMakeLists.txt
@@ -7,7 +7,7 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_libswift_module(Optimizer
-    DEPENDS SIL)
+    DEPENDS SIL ExperimentalRegex)
 
 add_subdirectory(Analysis)
 add_subdirectory(InstructionPasses)
diff --git a/libswift/Sources/Optimizer/PassManager/PassRegistration.swift b/libswift/Sources/Optimizer/PassManager/PassRegistration.swift
@@ -12,11 +12,13 @@
 
 import SIL
 import OptimizerBridging
+import ExperimentalRegex
 
 @_cdecl("initializeLibSwift")
 public func initializeLibSwift() {
   registerSILClasses()
   registerSwiftPasses()
+  registerParser()
 }
 
 private func registerPass(
diff --git a/stdlib/public/LLVMSupport/ErrorHandling.cpp b/stdlib/public/LLVMSupport/ErrorHandling.cpp
@@ -26,7 +26,7 @@
 
 #include <stdarg.h>
 
-#if defined(__APPLE__)
+#if SWIFT_STDLIB_HAS_ASL
 #include <asl.h>
 #elif defined(__ANDROID__)
 #include <android/log.h>
diff --git a/stdlib/public/Reflection/MetadataSource.cpp b/stdlib/public/Reflection/MetadataSource.cpp
@@ -12,8 +12,6 @@
 
 #include "swift/Reflection/MetadataSource.h"
 
-#include <sstream>
-
 using namespace swift;
 using namespace reflection;
 
diff --git a/stdlib/public/runtime/Errors.cpp b/stdlib/public/runtime/Errors.cpp
@@ -47,7 +47,7 @@
 #include <execinfo.h>
 #endif
 
-#if defined(__APPLE__)
+#if SWIFT_STDLIB_HAS_ASL
 #include <asl.h>
 #elif defined(__ANDROID__)
 #include <android/log.h>
diff --git a/stdlib/public/runtime/Metadata.cpp b/stdlib/public/runtime/Metadata.cpp
@@ -42,13 +42,6 @@
 // Avoid defining macro max(), min() which conflict with std::max(), std::min()
 #define NOMINMAX
 #include <windows.h>
-#else
-#include <sys/mman.h>
-#include <unistd.h>
-// WASI doesn't support dynamic linking yet.
-#if !defined(__wasi__)
-#include <dlfcn.h>
-#endif // !defined(__wasi__)
 #endif
 #if SWIFT_PTRAUTH
 #include <ptrauth.h>
@@ -65,10 +58,6 @@ extern "C" void _objc_setClassCopyFixupHandler(void (* _Nonnull newFixupHandler)
 #include "swift/Runtime/Debug.h"
 #include "Private.h"
 
-#if defined(__APPLE__)
-#include <mach/vm_page_size.h>
-#endif
-
 #if SWIFT_OBJC_INTEROP
 #include "ObjCRuntimeGetImageNameFromClass.h"
 #endif
diff --git a/stdlib/public/stubs/Stubs.cpp b/stdlib/public/stubs/Stubs.cpp
@@ -42,7 +42,9 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#if defined(__CYGWIN__) || defined(__HAIKU__)
 #include <sstream>
+#endif
 #if defined(__OpenBSD__) || defined(__ANDROID__) || defined(__linux__) || defined(__wasi__) || defined(_WIN32)
 #include <locale.h>
 #if defined(_WIN32)
@@ -288,6 +290,7 @@ static bool swift_stringIsSignalingNaN(const char *nptr) {
   return false;
 }
 
+#if defined(__CYGWIN__) || defined(__HAIKU__)
 // This implementation should only be used on platforms without the
 // relevant strto* functions, such as Cygwin or Haiku.
 // Note that using this currently causes test failures.
@@ -308,6 +311,7 @@ T _swift_strto(const char *nptr, char **endptr) {
 
   return ParsedValue;
 }
+#endif
 
 #if defined(__OpenBSD__) || defined(_WIN32) || defined(__CYGWIN__) || defined(__HAIKU__)
 #define NEED_SWIFT_STRTOD_L
diff --git a/test/ExperimentalRegex/Parse/Strawperson.swift b/test/ExperimentalRegex/Parse/Strawperson.swift
@@ -0,0 +1,6 @@
+// RUN: %target-typecheck-verify-swift -enable-experimental-regex
+// REQUIRES: libswift
+
+var s = 'abc'
+// expected-note@-1{{'Hello, 'abc''}}
+// expected-error@-2{{single-quoted string literal found, use '"'}}
diff --git a/test/SourceKit/Misc/parser-cutoff.swift b/test/SourceKit/Misc/parser-cutoff.swift
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp b/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,6 @@ func checkResult(_ plaintext: [UInt8]) {`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`@inline(never)`
`366`		`-@_assemblyVision`
`367`	`366`	`public func run_ChaCha(_ n: Int) {`
`368`	`367`	`let key = Array(repeating: UInt8(1), count: 32)`
`369`	`368`	`let nonce = Array(repeating: UInt8(2), count: 12)`
Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,7 @@ module OptimizerBridging {`
`8`	`8`	`export *`
`9`	`9`	`}`
`10`	`10`
	`11`	`+module ExperimentalRegexBridging {`
	`12`	`+ header "Parse/ExperimentalRegexBridging.h"`
	`13`	`+ export *`
	`14`	`+}`