---

yaml
---
r: 294639
b: refs/heads/tensorflow
c: c187300
h: refs/heads/master
i:
  294637: be7307b
  294635: 848ffe0
  294631: b695dd9
  294623: ee5fbe5

Author: marcrasi

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 46d5a2d2e34b8d0cbcf08ca9dbb4e993ff357610
+refs/heads/tensorflow: c187300c09aea70dbee873cf475ad8a96ef031ab
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/include/swift/Frontend/Frontend.h

@@ -518,12 +518,6 @@ class CompilerInstance {
   /// Returns true if there was an error during setup.
   bool setup(const CompilerInvocation &Invocation);
 
-  /// Returns true if there was an error during setup.
-  /// \param BaseFS Use this, instead of the real filesystem, as the vase
-  ///        filesystem.
-  bool setup(const CompilerInvocation &Invocation,
-             llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS);
-
 private:
   /// Set up the file system by loading and validating all VFS overlay YAML
   /// files. If the process of validating VFS files failed, or the overlay

branches/tensorflow/lib/Frontend/Frontend.cpp

@@ -176,17 +176,8 @@ void CompilerInstance::recordPrimarySourceFile(SourceFile *SF) {
 }
 
 bool CompilerInstance::setup(const CompilerInvocation &Invok) {
-  return setup(Invok, llvm::vfs::getRealFileSystem());
-}
-
-bool CompilerInstance::setup(
-    const CompilerInvocation &Invok,
-    llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS) {
-  assert(BaseFS);
   Invocation = Invok;
 
-  SourceMgr.setFileSystem(BaseFS);
-
   // If initializing the overlay file system fails there's no sense in
   // continuing because the compiler will read the wrong files.
   if (setUpVirtualFileSystemOverlays())

branches/tensorflow/test/SourceKit/CodeComplete/injected_vfs_swiftinterface.swift

@@ -0,0 +1,13 @@
+import SwiftModule
+
+func foo(
+    _ structDefinedInSwiftModule: StructDefinedInSwiftModule
+) {
+    structDefinedInSwiftModule.
+}
+
+// CHECK: key.name: "methodDefinedInSwiftModule()"
+
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-parseable-module-interface-path %t/SwiftModule.swiftinterface -module-name SwiftModule -emit-module -o /dev/null %S/../Inputs/vfs/SwiftModule/SwiftModule.swift
+// RUN: %sourcekitd-test -req=complete -pos=6:31 -vfs-files=/target_file1.swift=%s,/SwiftModule/SwiftModule.swiftinterface=%t/SwiftModule.swiftinterface /target_file1.swift -- /target_file1.swift -I /SwiftModule | %FileCheck %s

branches/tensorflow/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp

@@ -927,7 +927,8 @@ ASTUnitRef ASTProducer::createASTUnit(SwiftASTManager::Implementation &MgrImpl,
 
   Invocation.getLangOptions().CollectParsedToken = true;
 
-  if (CompIns.setup(Invocation, InvokRef->Impl.Opts.FileSystem)) {
+  CompIns.getSourceMgr().setFileSystem(InvokRef->Impl.Opts.FileSystem);
+  if (CompIns.setup(Invocation)) {
     // FIXME: Report the diagnostic.
     LOG_WARN_FUNC("Compilation setup failed!!!");
     Error = "compilation setup failed";

branches/tensorflow/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

@@ -185,7 +185,8 @@ static bool swiftCodeCompleteImpl(
   // FIXME: We need to be passing the buffers from the open documents.
   // It is not a huge problem in practice because Xcode auto-saves constantly.
 
-  if (CI.setup(Invocation, FileSystem)) {
+  CI.getSourceMgr().setFileSystem(FileSystem);
+  if (CI.setup(Invocation)) {
     // FIXME: error?
     return true;
   }