---

yaml
---
r: 341469
b: refs/heads/rxwei-patch-1
c: d0c5b6a
h: refs/heads/master
i:
  341467: 03a570c

Author: DougGregor

[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: c6b8ae5f1e04f507e07d62f9b01200f8c6b13aef
+refs/heads/rxwei-patch-1: d0c5b6a4e19bcba893b49563c989d4affafff1df
 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/README.md

@@ -17,7 +17,7 @@
 |**[Debian 9.1 (Raspberry Pi)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/armv7_debian_stretch.json)** | ARMv7 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_1/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_1)|
 |**[Fedora 27](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_fedora_27.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-fedora-27/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-fedora-27)|
 |**[Ubuntu 16.04](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04)|
-|**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/ppc64le_ubuntu_16_04.json)** | PPC64LE |[![Build Status](https://ci-external.swift.org/job/oss-swift-5.1-RA-linux-ubuntu-16.04-ppc64le/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-5.1-RA-linux-ubuntu-16.04-ppc64le)|
+|**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/ppc64le_ubuntu_16_04.json)** | PPC64LE |[![Build Status](https://ci-external.swift.org/job/oss-swift-4.1-RA-linux-ubuntu-16.04-ppc64le/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-4.1-RA-linux-ubuntu-16.04-ppc64le)|
 |**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/aarch64_ubuntu_16.04.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64)|
 |**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | ARMv7 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android)|
 |**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64)|

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

@@ -91,6 +91,10 @@ 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/Basic/LangOptions.h

@@ -314,9 +314,6 @@ namespace swift {
     /// and faster rebuilds.
     bool EnableExperimentalDependencies = false;
 
-    /// Enable the experimental opaque result types feature.
-    bool EnableOpaqueResultTypes = true;
-    
     /// To mimic existing system, set to false.
     /// To experiment with including file-private and private dependency info,
     /// set to true.

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

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

branches/rxwei-patch-1/include/swift/Option/FrontendOptions.td

@@ -413,10 +413,6 @@ def solver_enable_operator_designated_types :
   Flag<["-"], "solver-enable-operator-designated-types">,
   HelpText<"Enable operator designated types in constraint solver">;
 
-def enable_opaque_result_types :
-  Flag<["-"], "enable-opaque-result-types">,
-  HelpText<"Enable experimental opaque result types feature">;
-
 def switch_checking_invocation_threshold_EQ : Joined<["-"],
     "switch-checking-invocation-threshold=">;
 

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

@@ -1233,23 +1233,16 @@ CanType TypeBase::getCanonicalType(GenericSignature *sig) {
 }
 
 TypeBase *TypeBase::reconstituteSugar(bool Recursive) {
-  auto Func = [Recursive](Type Ty) -> Type {
+  auto Func = [](Type Ty) -> Type {
     if (auto boundGeneric = dyn_cast<BoundGenericType>(Ty.getPointer())) {
-
-      auto getGenericArg = [&](unsigned i) -> Type {
-        auto arg = boundGeneric->getGenericArgs()[i];
-        if (Recursive)
-          arg = arg->reconstituteSugar(Recursive);
-        return arg;
-      };
-
       auto &ctx = boundGeneric->getASTContext();
       if (boundGeneric->getDecl() == ctx.getArrayDecl())
-        return ArraySliceType::get(getGenericArg(0));
+        return ArraySliceType::get(boundGeneric->getGenericArgs()[0]);
       if (boundGeneric->getDecl() == ctx.getDictionaryDecl())
-        return DictionaryType::get(getGenericArg(0), getGenericArg(1));
+        return DictionaryType::get(boundGeneric->getGenericArgs()[0],
+                                   boundGeneric->getGenericArgs()[1]);
       if (boundGeneric->getDecl() == ctx.getOptionalDecl())
-        return OptionalType::get(getGenericArg(0));
+        return OptionalType::get(boundGeneric->getGenericArgs()[0]);
     }
     return Ty;
   };

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

@@ -1012,35 +1012,14 @@ ClangImporter::create(ASTContext &ctx,
 
   // Set up the file manager.
   {
-    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++;
+    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);
       }
-
-      instance.setVirtualFileSystem(ClangImporterFS);
+      instance.setVirtualFileSystem(ctx.SourceMgr.getFileSystem());
     }
     instance.createFileManager();
   }

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

@@ -276,9 +276,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnableOperatorDesignatedTypes |=
       Args.hasArg(OPT_enable_operator_designated_types);
 
-  Opts.EnableOpaqueResultTypes |=
-      Args.hasArg(OPT_enable_opaque_result_types);
-
   // Always enable operator designated types for the standard library.
   Opts.EnableOperatorDesignatedTypes |= FrontendOpts.ParseStdlib;
 

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

@@ -235,6 +235,9 @@ 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,
@@ -261,7 +264,14 @@ bool CompilerInstance::setUpVirtualFileSystemOverlays() {
     hadAnyFailure |=
         loadAndValidateVFSOverlay(File, BaseFS, OverlayFS, Diagnostics);
   }
-  SourceMgr.setFileSystem(OverlayFS);
+
+  // 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);
+  }
+
   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::OverlayFileSystem &fs;
+  llvm::vfs::FileSystem &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::OverlayFileSystem &fs;
+  llvm::vfs::FileSystem &fs;
   DiagnosticEngine &diags;
   ModuleRebuildInfo rebuildInfo;
   const StringRef modulePath;

branches/rxwei-patch-1/lib/Parse/ParseType.cpp

@@ -697,9 +697,7 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,
   // This is only semantically allowed in certain contexts, but we parse it
   // generally for diagnostics and recovery.
   SourceLoc opaqueLoc;
-  if (Context.LangOpts.EnableOpaqueResultTypes
-      && Tok.is(tok::identifier)
-      && Tok.getRawText() == "some") {
+  if (Tok.is(tok::identifier) && Tok.getRawText() == "some") {
     // Treat some as a keyword.
     TokReceiver->registerTokenKindChange(Tok.getLoc(), tok::contextual_keyword);
     opaqueLoc = consumeToken();
@@ -765,9 +763,7 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,
     }
 
     // Diagnose invalid `some` after an ampersand.
-    if (Context.LangOpts.EnableOpaqueResultTypes
-        && Tok.is(tok::identifier)
-        && Tok.getRawText() == "some") {
+    if (Tok.is(tok::identifier) && Tok.getRawText() == "some") {
       auto badLoc = consumeToken();
 
       // TODO: Fixit to move to beginning of composition.