---

yaml
---
r: 341919
b: refs/heads/rxwei-patch-1
c: fc827e6
h: refs/heads/master
i:
  341917: 60151c2
  341915: 08e4f2d
  341911: 0ae51d1
  341903: d6f635e
  341887: 9491508

Author: gottesmm

[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: a98bfd69e0a258f3101c649088390a3b774ca9ef
+refs/heads/rxwei-patch-1: fc827e63be0d05271a4bacc88f3b223c1142e0e6
 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/include/swift/ClangImporter/ClangImporterOptions.h

@@ -100,10 +100,6 @@ class ClangImporterOptions {
   /// When set, don't enforce warnings with -Werror.
   bool DebuggerSupport = false;
 
-  /// When set, clobber the Clang instance's virtual file system with the Swift
-  /// virtual file system.
-  bool ForceUseSwiftVirtualFileSystem = false;
-
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.
   llvm::hash_code getPCHHashComponents() const {

branches/rxwei-patch-1/include/swift/IDE/IDERequestIDZone.def

@@ -15,4 +15,3 @@
 //
 //===----------------------------------------------------------------------===//
 SWIFT_TYPEID(CursorInfoRequest)
-SWIFT_TYPEID(RangeInfoRequest)

branches/rxwei-patch-1/include/swift/IDE/IDERequests.h

@@ -23,9 +23,6 @@
 #include "swift/IDE/IDETypeIDs.h"
 
 namespace swift {
-//----------------------------------------------------------------------------//
-// Cusor info
-//----------------------------------------------------------------------------//
 
 // Input for CursorInfoRequest.
 // Putting the source file and location together allows us to print the request
@@ -79,67 +76,6 @@ class CursorInfoRequest:
   SourceLoc getNearestLoc() const;
 };
 
-//----------------------------------------------------------------------------//
-// Range info
-//----------------------------------------------------------------------------//
-
-// Input for RangeInfoRequest.
-// Putting the source file and location together allows us to print the request
-// input well e.g. file.swift:3:4
-struct RangeInfoOwner {
-  SourceFile *File;
-  SourceLoc StartLoc;
-  SourceLoc EndLoc;
-
-  RangeInfoOwner(SourceFile *File, SourceLoc StartLoc, SourceLoc EndLoc):
-    File(File), StartLoc(StartLoc), EndLoc(EndLoc) {}
-  RangeInfoOwner(SourceFile *File, unsigned Offset, unsigned Length);
-
-  friend llvm::hash_code hash_value(const RangeInfoOwner &CI) {
-    return hash_combine(hash_value(CI.File),
-                        hash_value(CI.StartLoc.getOpaquePointerValue()),
-                        hash_value(CI.EndLoc.getOpaquePointerValue()));
-  }
-
-  friend bool operator==(const RangeInfoOwner &lhs, const RangeInfoOwner &rhs) {
-    return lhs.File == rhs.File && lhs.StartLoc == rhs.StartLoc &&
-      lhs.EndLoc == rhs.EndLoc;
-  }
-
-  friend bool operator!=(const RangeInfoOwner &lhs, const RangeInfoOwner &rhs) {
-    return !(lhs == rhs);
-  }
-
-  bool isValid() const {
-    return File && File->getBufferID() && StartLoc.isValid() && EndLoc.isValid();
-  }
-};
-
-void simple_display(llvm::raw_ostream &out, const RangeInfoOwner &owner);
-
-/// Resolve cursor info at a given location.
-class RangeInfoRequest:
-    public SimpleRequest<RangeInfoRequest,
-                         ide::ResolvedRangeInfo(RangeInfoOwner),
-                         CacheKind::Cached>
-{
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  llvm::Expected<ide::ResolvedRangeInfo> evaluate(Evaluator &evaluator,
-    RangeInfoOwner CI) const;
-
-public:
-  // Caching
-  bool isCached() const { return true; }
-  // Source location
-  SourceLoc getNearestLoc() const;
-};
-
 /// The zone number for the IDE.
 #define SWIFT_IDE_REQUESTS_TYPEID_ZONE 137
 #define SWIFT_TYPEID_ZONE SWIFT_IDE_REQUESTS_TYPEID_ZONE

branches/rxwei-patch-1/include/swift/IDE/IDETypeIDZone.def

@@ -15,4 +15,3 @@
 //
 //===----------------------------------------------------------------------===//
 SWIFT_TYPEID_NAMED(ide::ResolvedCursorInfo, ResolvedCursorInfo)
-SWIFT_TYPEID_NAMED(ide::ResolvedRangeInfo, ResolvedRangeInfo)

branches/rxwei-patch-1/include/swift/IDE/Utils.h

@@ -368,26 +368,32 @@ struct ResolvedRangeInfo {
                     TokensInRange, nullptr, /*Commom Expr Parent*/nullptr,
                     /*Single entry*/true, /*unhandled error*/false,
                     OrphanKind::None, {}, {}, {}) {}
-  ResolvedRangeInfo(): ResolvedRangeInfo(ArrayRef<Token>()) {}
-  void print(llvm::raw_ostream &OS) const;
+  void print(llvm::raw_ostream &OS);
   ExitState exit() const { return ExitInfo.Exit; }
   Type getType() const { return ExitInfo.ReturnType; }
 
-  friend bool operator==(const ResolvedRangeInfo &lhs,
-                         const ResolvedRangeInfo &rhs) {
-    if (lhs.TokensInRange.size() != rhs.TokensInRange.size())
-      return false;
-    if (lhs.TokensInRange.empty())
-      return true;
-    return lhs.TokensInRange.front().getLoc() ==
-      rhs.TokensInRange.front().getLoc();
-  }
-
 private:
   static CharSourceRange calculateContentRange(ArrayRef<Token> Tokens);
 };
 
-void simple_display(llvm::raw_ostream &out, const ResolvedRangeInfo &info);
+class RangeResolver : public SourceEntityWalker {
+  struct Implementation;
+  std::unique_ptr<Implementation> Impl;
+  bool walkToExprPre(Expr *E) override;
+  bool walkToExprPost(Expr *E) override;
+  bool walkToStmtPre(Stmt *S) override;
+  bool walkToStmtPost(Stmt *S) override;
+  bool walkToDeclPre(Decl *D, CharSourceRange Range) override;
+  bool walkToDeclPost(Decl *D) override;
+  bool visitDeclReference(ValueDecl *D, CharSourceRange Range,
+                          TypeDecl *CtorTyRef, ExtensionDecl *ExtTyRef, Type T,
+                          ReferenceMetaData Data) override;
+public:
+  RangeResolver(SourceFile &File, SourceLoc Start, SourceLoc End);
+  RangeResolver(SourceFile &File, unsigned Offset, unsigned Length);
+  ~RangeResolver();
+  ResolvedRangeInfo resolve();
+};
 
 /// This provides a utility to view a printed name by parsing the components
 /// of that name. The components include a base name and an array of argument

branches/rxwei-patch-1/include/swift/Strings.h

@@ -54,7 +54,8 @@ struct BuiltinNameStringLiteral {
   const StringLiteral literal;
 
   constexpr operator StringRef() const { return literal; }
-  constexpr const StringRef getWithoutPrefix() const {
+
+  StringRef getWithoutPrefix() const {
     return literal.drop_front(BUILTIN_TYPE_NAME_PREFIX.size());
   }
 };

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

@@ -1018,11 +1018,10 @@ ClangImporter::create(ASTContext &ctx,
 
   // Set up the file manager.
   {
-    if (!ctx.SearchPathOpts.VFSOverlayFiles.empty() ||
-        importerOpts.ForceUseSwiftVirtualFileSystem) {
+    if (!ctx.SearchPathOpts.VFSOverlayFiles.empty()) {
       // If the clang instance has overlays it means the user has provided
-      // -ivfsoverlay options.  We're going to clobber their file system with
-      // the Swift file system, so warn about it.
+      // -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);
       }

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

@@ -256,20 +256,19 @@ static bool loadAndValidateVFSOverlay(
 }
 
 bool CompilerInstance::setUpVirtualFileSystemOverlays() {
-  auto BaseFS = SourceMgr.getFileSystem();
+  auto BaseFS = llvm::vfs::getRealFileSystem();
   auto OverlayFS = llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem>(
                     new llvm::vfs::OverlayFileSystem(BaseFS));
   bool hadAnyFailure = false;
-  bool hasOverlays = false;
   for (const auto &File : Invocation.getSearchPathOptions().VFSOverlayFiles) {
-    hasOverlays = true;
     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 && hasOverlays) {
+  if (!hadAnyFailure &&
+      (OverlayFS->overlays_begin() != OverlayFS->overlays_end())) {
     SourceMgr.setFileSystem(OverlayFS);
   }