---

yaml
---
r: 341435
b: refs/heads/rxwei-patch-1
c: f359cef
h: refs/heads/master
i:
  341433: f337638
  341431: 2724e76

Author: JDevlieghere

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 259571a7f7d95472fe53270a21951702efa02d8b
+refs/heads/rxwei-patch-1: f359cef5d0b86840cbea97a52717c2ed0acbb386
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/benchmark/single-source/AngryPhonebook.swift

@@ -14,59 +14,11 @@
 // to test uppercase and lowercase ASCII string fast paths.
 import TestsUtils
 
-let t: [BenchmarkCategory] = [.validation, .api, .String]
-
-public let AngryPhonebook = [
-  BenchmarkInfo(
-    name: "AngryPhonebook",
-    runFunction: run_AngryPhonebook,
-    tags: t,
-    legacyFactor: 7),
-
-  // Small String Workloads
-  BenchmarkInfo(
-    name: "AngryPhonebook.ASCII.Small",
-    runFunction: { angryPhonebook($0, ascii) },
-    tags: t,
-    setUpFunction: { blackHole(ascii) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Strasse.Small",
-    runFunction: { angryPhonebook($0, strasse) },
-    tags: t,
-    setUpFunction: { blackHole(strasse) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Armenian.Small",
-    runFunction: { angryPhonebook($0, armenian) },
-    tags: t,
-    setUpFunction: { blackHole(armenian) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Cyrillic.Small",
-    runFunction: { angryPhonebook($0, cyrillic) },
-    tags: t,
-    setUpFunction: { blackHole(cyrillic) }),
-
-  // Regular String Workloads
-  BenchmarkInfo(
-    name: "AngryPhonebook.ASCII",
-    runFunction: { angryPhonebook($0, precomposed: longASCII) },
-    tags: t,
-    setUpFunction: { blackHole(longASCII) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Strasse",
-    runFunction: { angryPhonebook($0, precomposed: longStrasse) },
-    tags: t,
-    setUpFunction: { blackHole(longStrasse) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Armenian",
-    runFunction: { angryPhonebook($0, precomposed: longArmenian) },
-    tags: t,
-    setUpFunction: { blackHole(longArmenian) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Cyrillic",
-    runFunction: { angryPhonebook($0, precomposed: longCyrillic) },
-    tags: t,
-    setUpFunction: { blackHole(longCyrillic) })
-]
+public let AngryPhonebook = BenchmarkInfo(
+  name: "AngryPhonebook",
+  runFunction: run_AngryPhonebook,
+  tags: [.validation, .api, .String],
+  legacyFactor: 7)
 
 let words = [
   "James", "John", "Robert", "Michael", "William", "David", "Richard", "Joseph",
@@ -86,67 +38,3 @@ public func run_AngryPhonebook(_ N: Int) {
     }
   }
 }
-
-// Workloads for various scripts. Always 20 names for 400 pairings.
-// To keep the performance of various scripts roughly comparable, aim for
-// a total length of approximately 120 characters.
-// E.g.: `ascii.joined(separator: "").count == 124`
-// Every name should fit in 15-bytes UTF-8 encoded, to excercise the small
-// string optimization.
-// E.g.: `armenian.allSatisfy { $0._guts.isSmall } == true`
-
-// Workload Size Statistics
-//   SMALL  | UTF-8 | UTF-16 |    REGULAR   |  UTF-8  | UTF-16
-// ---------|-------|--------|--------------|---------|--------
-//    ascii | 124 B |  248 B |    longASCII |  6158 B | 12316 B
-//  strasse | 140 B |  240 B |  longStrasse |  6798 B | 11996 B
-// armenian | 232 B |  232 B | longArmenian | 10478 B | 11676 B
-// cyrillic | 238 B |  238 B | longCyrillic | 10718 B | 11916 B
-
-let ascii = Array(words.prefix(20))
-// Pathological case, uppercase: ß -> SS
-let strasse = Array(repeating: "Straße", count: 20)
-
-let armenian = [
-  "Արմեն", "Աննա", "Հարութ", "Միքայել", "Մարիա", "Դավիթ", "Վարդան",
-  "Նարինե", "Տիգրան", "Տաթևիկ", "Թագուհի", "Թամարա", "Ազնաուր", "Գրիգոր",
-  "Կոմիտաս", "Հայկ", "Գառնիկ", "Վահրամ", "Վահագն", "Գևորգ"]
-
-let cyrillic = [
-  "Ульяна", "Аркадий", "Аня", "Даниил", "Дмитрий", "Эдуард", "Юрій", "Давид",
-  "Анна", "Дмитрий", "Евгений", "Борис", "Ксения", "Артур", "Аполлон",
-  "Соломон", "Николай", "Кристи", "Надежда", "Спартак"]
-
-/// Precompose the phonebook into one large string of comma separated names.
-func phonebook(_ names: [String]) -> String {
-  names.map { firstName in
-    names.map { lastName in
-      firstName + " " + lastName
-    }.joined(separator: ", ")
-  }.joined(separator: ", ")
-}
-
-let longASCII = phonebook(ascii)
-let longStrasse = phonebook(strasse)
-let longArmenian = phonebook(armenian)
-let longCyrillic = phonebook(cyrillic)
-
-@inline(never)
-public func angryPhonebook(_ N: Int, _ names: [String]) {
-  assert(names.count == 20)
-  // Permute the names.
-  for _ in 1...N {
-    for firstname in names {
-      for lastname in names {
-        blackHole((firstname.uppercased(), lastname.lowercased()))
-      }
-    }
-  }
-}
-
-@inline(never)
-public func angryPhonebook(_ N: Int, precomposed names: String) {
-  for _ in 1...N {
-    blackHole((names.uppercased(), names.lowercased()))
-  }
-}

branches/rxwei-patch-1/cmake/modules/AddSwift.cmake

@@ -1905,7 +1905,7 @@ function(add_swift_target_library name)
     if(SWIFTLIB_SHARED)
       if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
         list(APPEND swiftlib_link_flags_all "-dynamiclib -Wl,-headerpad_max_install_names")
-      elseif(${sdk} STREQUAL ANDROID)
+      elseif(sdk STREQUAL ANDROID)
         list(APPEND swiftlib_link_flags_all "-shared")
         # TODO: Instead of `lib${name}.so` find variable or target property which already have this value.
         list(APPEND swiftlib_link_flags_all "-Wl,-soname,lib${name}.so")

branches/rxwei-patch-1/include/swift/AST/Builtins.def

@@ -551,20 +551,6 @@ BUILTIN_MISC_OPERATION(WillThrow, "willThrow", "", Special)
 /// poundAssert has type (Builtin.Int1, Builtin.RawPointer) -> ().
 BUILTIN_MISC_OPERATION(PoundAssert, "poundAssert", "", Special)
 
-// BUILTIN_MISC_OPERATION_WITH_SILGEN - Miscellaneous operations that are
-// specially emitted during SIL generation.
-#ifndef BUILTIN_MISC_OPERATION_WITH_SILGEN
-#define BUILTIN_MISC_OPERATION_WITH_SILGEN(Id, Name, Attrs, Overload) \
-  BUILTIN_MISC_OPERATION(Id, Name, Attrs, Overload)
-#endif
-
-/// globalStringTablePointer has type String -> Builtin.RawPointer.
-/// It returns an immortal, global string table pointer for strings constructed
-/// from string literals.
-BUILTIN_MISC_OPERATION_WITH_SILGEN(GlobalStringTablePointer, "globalStringTablePointer", "", Special)
-
-#undef BUILTIN_MISC_OPERATION_WITH_SILGEN
-
 #undef BUILTIN_MISC_OPERATION
 
 /// Builtins for instrumentation added by sanitizers during SILGen.

branches/rxwei-patch-1/include/swift/AST/DiagnosticsClangImporter.def

@@ -91,10 +91,6 @@ WARNING(implicit_bridging_header_imported_from_module,none,
         "is deprecated and will be removed in a later version of Swift",
         (StringRef, Identifier))
 
-WARNING(clang_vfs_overlay_is_ignored,none,
-        "ignoring '-ivfsoverlay' options provided to '-Xcc' in favor of "
-        "'-vfsoverlay'", ())
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSIL.def

@@ -484,7 +484,7 @@ NOTE(switch_value_case_doesnt_yield, none, "missing yield in the %0 case",
 NOTE(try_branch_doesnt_yield, none, "missing yield when error is "
      "%select{not |}0thrown", (bool))
 
-// OS log optimization diagnostics.
+// OS log optimization dianostics.
 
 ERROR(oslog_message_argument_not_found, none, "no argument of type %0 in "
   " the os log call", (Identifier))
@@ -505,9 +505,6 @@ ERROR(oslog_non_constant_interpolation, none, "'OSLogInterpolation' struct is "
 ERROR(oslog_property_not_constant, none, "'OSLogInterpolation.%0' is not a "
       "constant: formatting and privacy options must be literals", (StringRef))
 
-ERROR(global_string_pointer_on_non_constant, none, "globalStringTablePointer "
-      "builtin must used only on string literals", ())
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

branches/rxwei-patch-1/include/swift/Basic/SourceManager.h

@@ -23,10 +23,16 @@
 
 namespace swift {
 
+static inline llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem>
+getRealOverlayFileSystem() {
+  return llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem>(
+      new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
+}
+
 /// This class manages and owns source buffers.
 class SourceManager {
   llvm::SourceMgr LLVMSourceMgr;
-  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem;
+  llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> FileSystem;
   unsigned CodeCompletionBufferID = 0U;
   unsigned CodeCompletionOffset;
 
@@ -49,9 +55,9 @@ class SourceManager {
   mutable std::pair<const char *, const VirtualFile*> CachedVFile = {nullptr, nullptr};
 
 public:
-  SourceManager(llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS =
-                    llvm::vfs::getRealFileSystem())
-    : FileSystem(FS) {}
+  SourceManager(llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> FS =
+                    getRealOverlayFileSystem())
+      : FileSystem(FS) {}
 
   llvm::SourceMgr &getLLVMSourceMgr() {
     return LLVMSourceMgr;
@@ -60,11 +66,12 @@ class SourceManager {
     return LLVMSourceMgr;
   }
 
-  void setFileSystem(llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS) {
+  void
+  setFileSystem(llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> FS) {
     FileSystem = FS;
   }
 
-  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> getFileSystem() {
+  llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> getFileSystem() {
     return FileSystem;
   }
 
@@ -254,4 +261,3 @@ class SourceManager {
 } // end namespace swift
 
 #endif // SWIFT_BASIC_SOURCEMANAGER_H
-

branches/rxwei-patch-1/lib/AST/Builtins.cpp

@@ -951,13 +951,6 @@ static ValueDecl *getGetObjCTypeEncodingOperation(ASTContext &Context,
   return builder.build(Id);
 }
 
-static ValueDecl *getGlobalStringTablePointer(ASTContext &Context,
-                                              Identifier Id) {
-  // String -> Builtin.RawPointer
-  auto stringType = NominalType::get(Context.getStringDecl(), Type(), Context);
-  return getBuiltinFunction(Id, {stringType}, Context.TheRawPointerType);
-}
-
 static ValueDecl *getPoundAssert(ASTContext &Context, Identifier Id) {
   auto int1Type = BuiltinIntegerType::get(1, Context);
   auto optionalRawPointerType = BoundGenericEnumType::get(
@@ -1967,9 +1960,6 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
   case BuiltinValueKind::GetObjCTypeEncoding:
     return getGetObjCTypeEncodingOperation(Context, Id);
 
-  case BuiltinValueKind::GlobalStringTablePointer:
-    return getGlobalStringTablePointer(Context, Id);
-
   case BuiltinValueKind::PoundAssert:
     return getPoundAssert(Context, Id);
 

branches/rxwei-patch-1/lib/ClangImporter/ClangImporter.cpp

@@ -1012,14 +1012,35 @@ ClangImporter::create(ASTContext &ctx,
 
   // Set up the file manager.
   {
-    if (!ctx.SearchPathOpts.VFSOverlayFiles.empty()) {
-      // If the clang instance has overlays it means the user has provided
-      // -ivfsoverlay options and swift -vfsoverlay options.  We're going to
-      // clobber their file system with our own, so warn about it.
-      if (!instance.getHeaderSearchOpts().VFSOverlayFiles.empty()) {
-        ctx.Diags.diagnose(SourceLoc(), diag::clang_vfs_overlay_is_ignored);
-      }
+    if (instance.getHeaderSearchOpts().VFSOverlayFiles.empty()) {
       instance.setVirtualFileSystem(ctx.SourceMgr.getFileSystem());
+    } else {
+      // Initialize the clang VFS from its compiler invocation.
+      instance.createFileManager();
+
+      // Create a new overlay file system for the clang importer with the clang
+      // VFS as its root.
+      auto ClangImporterFS =
+          llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem>(
+              new llvm::vfs::OverlayFileSystem(
+                  &instance.getVirtualFileSystem()));
+
+      auto SwiftFS = ctx.SourceMgr.getFileSystem();
+      auto it = SwiftFS->overlays_rbegin();
+      auto end = SwiftFS->overlays_rend();
+
+      // The Swift file system is an overlay file system with the real file
+      // system as its root. Skip the root so we query the other overlays
+      // before falling back to the real file system.
+      it++;
+
+      // Add all remaining Swift overlay file systems to the new file system.
+      while (it != end) {
+        ClangImporterFS->pushOverlay(*it);
+        it++;
+      }
+
+      instance.setVirtualFileSystem(ClangImporterFS);
     }
     instance.createFileManager();
   }

branches/rxwei-patch-1/lib/Frontend/Frontend.cpp

@@ -235,9 +235,6 @@ static bool loadAndValidateVFSOverlay(
     const llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> &BaseFS,
     const llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> &OverlayFS,
     DiagnosticEngine &Diag) {
-  // FIXME: It should be possible to allow chained lookup of later VFS overlays
-  // through the mapping defined by earlier overlays.
-  // See rdar://problem/39440687
   auto Buffer = BaseFS->getBufferForFile(File);
   if (!Buffer) {
     Diag.diagnose(SourceLoc(), diag::cannot_open_file, File,
@@ -264,14 +261,7 @@ bool CompilerInstance::setUpVirtualFileSystemOverlays() {
     hadAnyFailure |=
         loadAndValidateVFSOverlay(File, BaseFS, OverlayFS, Diagnostics);
   }
-
-  // If we successfully loaded all the overlays, let the source manager and
-  // diagnostic engine take advantage of the overlay file system.
-  if (!hadAnyFailure &&
-      (OverlayFS->overlays_begin() != OverlayFS->overlays_end())) {
-    SourceMgr.setFileSystem(OverlayFS);
-  }
-
+  SourceMgr.setFileSystem(OverlayFS);
   return hadAnyFailure;
 }
 

branches/rxwei-patch-1/lib/Frontend/ParseableInterfaceModuleLoader.cpp

@@ -273,7 +273,7 @@ static Optional<StringRef> getRelativeDepPath(StringRef DepPath,
 /// output path.
 /// \note Needs to be in the swift namespace so CompilerInvocation can see it.
 class swift::ParseableInterfaceBuilder {
-  llvm::vfs::FileSystem &fs;
+  llvm::vfs::OverlayFileSystem &fs;
   DiagnosticEngine &diags;
   const StringRef interfacePath;
   const StringRef moduleName;
@@ -765,7 +765,7 @@ class ParseableInterfaceModuleLoaderImpl {
   using AccessPathElem = std::pair<Identifier, SourceLoc>;
   friend class swift::ParseableInterfaceModuleLoader;
   ASTContext &ctx;
-  llvm::vfs::FileSystem &fs;
+  llvm::vfs::OverlayFileSystem &fs;
   DiagnosticEngine &diags;
   ModuleRebuildInfo rebuildInfo;
   const StringRef modulePath;

branches/rxwei-patch-1/lib/IRGen/GenBuiltin.cpp

@@ -354,18 +354,6 @@ if (Builtin.ID == BuiltinValueKind::id) { \
 #define BUILTIN(ID, Name, Attrs)  // Ignore the rest.
 #include "swift/AST/Builtins.def"
 
-  if (Builtin.ID == BuiltinValueKind::GlobalStringTablePointer) {
-    // This builtin should be used only on strings constructed from a
-    // string literal. If we ever get to the point of executing this builtin
-    // at run time, it implies an incorrect use of the builtin and must result
-    // in a trap.
-    IGF.emitTrap(/*Unreachable=*/false);
-    auto returnValue = llvm::UndefValue::get(IGF.IGM.Int8PtrTy);
-    // Consume the arguments of the builtin.
-    (void)args.claimAll();
-    return out.add(returnValue);
-  }
-
   if (Builtin.ID == BuiltinValueKind::WillThrow) {
     // willThrow is emitted like a Swift function call with the error in
     // the error return register. We also have to pass a fake context

branches/rxwei-patch-1/lib/Immediate/Immediate.cpp

@@ -78,11 +78,7 @@ static void *loadRuntimeLib(StringRef sharedLibName,
 
 void *swift::immediate::loadSwiftRuntime(ArrayRef<std::string>
                                          runtimeLibPaths) {
-#if defined(_WIN32)
-  return loadRuntimeLib("swiftCore" LTDL_SHLIB_EXT, runtimeLibPaths);
-#else
   return loadRuntimeLib("libswiftCore" LTDL_SHLIB_EXT, runtimeLibPaths);
-#endif
 }
 
 static bool tryLoadLibrary(LinkLibrary linkLib,