sourcekitd source.request.index_to_store fixes - new test and minor changes

Author: DavidGoldman

test/SourceKit/Indexing/Inputs/indexstore_multifile_other.swift

@@ -0,0 +1,4 @@
+struct OtherStruct {
+  let x: Int
+  let y: Int
+}

test/SourceKit/Indexing/indexstore_multifile.swift

@@ -0,0 +1,23 @@
+// RUN: %empty-directory(%t)
+// RUN: %sourcekitd-test -req=index-to-store %s -index-store-path %t/idx -index-unit-output-path %t/indexstore_multifile.o -- -c -module-name indexstoremodule -o args_output_path.o %s %S/Inputs/indexstore_multifile_other.swift
+// RUN: c-index-test core -print-unit %t/idx | %FileCheck  --dump-input=always --dump-input-filter=all %s
+
+struct Foo {
+  let bar: Int
+  let counter: Int
+  let other: OtherStruct
+
+  init(bar: Int, counter: Int = 0, other: OtherStruct) {
+    self.bar = bar
+    self.counter = counter
+    self.other = other
+  }
+}
+
+// CHECK: indexstore_multifile.o-{{.*}}
+// CHECK: module-name: indexstoremodule
+// CHECK: main-path: SOURCE_DIR/test/SourceKit/Indexing/indexstore_multifile.swift
+// CHECK: out-file: BUILD_DIR{{.*}}indexstore_multifile.o
+// CHECK: is-debug: 1
+// CHECK: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule
+// CHECK: Record | user | SOURCE_DIR/test/SourceKit/Indexing/indexstore_multifile.swift | indexstore_multifile.swift-{{.*}}

test/SourceKit/Indexing/indexstore.swift renamed to test/SourceKit/Indexing/indexstore_with_remappings.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %sourcekitd-test -req=index-to-store %s -index-store-path %t/idx -index-unit-output-path %t/indexstore.o -- -c -module-name indexstoremodule -file-prefix-map %S=REMAPPED_SRC_ROOT -file-prefix-map %t=REMAPPED_OUT_DIR %s
+// RUN: %sourcekitd-test -req=index-to-store %s -index-store-path %t/idx -index-unit-output-path %t/indexstore_with_remappings.o -- -c -module-name indexstoremodule -file-prefix-map %S=REMAPPED_SRC_ROOT -file-prefix-map %t=REMAPPED_OUT_DIR %s
 // RUN: c-index-test core -print-unit %t/idx | %FileCheck %s
 
 class Foo {
@@ -9,9 +9,9 @@ class Foo {
   }
 }
 
-// CHECK: indexstore.o-{{.*}}
+// CHECK: indexstore_with_remappings.o-{{.*}}
 // CHECK: module-name: indexstoremodule
-// CHECK: main-path: REMAPPED_SRC_ROOT/indexstore.swift
-// CHECK: out-file: REMAPPED_OUT_DIR/indexstore.o
+// CHECK: main-path: REMAPPED_SRC_ROOT/indexstore_with_remappings.swift
+// CHECK: out-file: REMAPPED_OUT_DIR/indexstore_with_remappings.o
 // CHECK: is-debug: 1
 // CHECK: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule

tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

@@ -401,13 +401,13 @@ static void emitIndexDataForSourceFile(SourceFile &PrimarySourceFile,
 }
 
 void SwiftLangSupport::indexToStore(
-    StringRef InputFile, ArrayRef<const char *> Args,
+    StringRef PrimaryFilePath, ArrayRef<const char *> Args,
     IndexStoreOptions Opts,
     SourceKitCancellationToken CancellationToken,
     IndexToStoreReceiver Receiver) {
   std::string Error;
   SwiftInvocationRef Invok =
-      ASTMgr->getTypecheckInvocation(Args, InputFile, Error);
+      ASTMgr->getTypecheckInvocation(Args, PrimaryFilePath, Error);
   if (!Invok) {
     LOG_WARN_FUNC("failed to create an ASTInvocation: " << Error);
     Receiver(RequestResult<IndexStoreInfo>::fromError(Error));
@@ -439,10 +439,8 @@ void SwiftLangSupport::indexToStore(
   };
 
   auto ASTConsumer = std::make_shared<IndexStoreASTConsumer>(std::move(Receiver), std::move(Opts));
-  /// FIXME: When request cancellation is implemented and Xcode adopts it,
-  /// don't use 'OncePerASTToken'.
-  static const char OncePerASTToken = 0;
-  getASTManager()->processASTAsync(Invok, ASTConsumer, &OncePerASTToken,
+  getASTManager()->processASTAsync(Invok, ASTConsumer,
+                                   /*OncePerASTToken=*/nullptr,
                                    CancellationToken,
                                    llvm::vfs::getRealFileSystem());
 }

tools/SourceKit/tools/sourcekitd/lib/Service/Requests.cpp

@@ -1444,7 +1444,7 @@ static void handleRequestIndexToStore(
     else
       return Rec(createErrorRequestInvalid("'key.index_unit_output_path' is required"));
 
-    SmallVector<const char *, 8> Args;
+    SmallVector<const char *, 0> Args;
     if (getCompilerArgumentsForRequestOrEmitError(Req, Args, Rec))
       return;
     LangSupport &Lang = getGlobalContext().getSwiftLangSupport();