Merge remote-tracking branch 'origin/swift-4.0-branch' into stable
diff --git a/tools/c-index-test/core_main.cpp b/tools/c-index-test/core_main.cpp
index 1335b05..0bafcda 100644
--- a/tools/c-index-test/core_main.cpp
+++ b/tools/c-index-test/core_main.cpp
@@ -572,6 +572,12 @@
   return 1;
 }
 
+static int printStoreFileRecord(StringRef storePath, StringRef filePath,
+                                Optional<unsigned> lineStart, unsigned lineCount,
+                                raw_ostream &OS) {
+  return 1;
+}
+
 #endif
 
 //===----------------------------------------------------------------------===//
@@ -772,6 +778,8 @@
   }
 #if HAVE_CORESERVICES
   dispatch_main();
+#else
+  return 1;
 #endif
 }
 
@@ -881,9 +889,11 @@
       return printUnit(options::InputFiles[0], outs());
   }
 
+#if INDEXSTORE_HAS_BLOCKS
   if (options::Action == ActionType::PrintStoreFormatVersion) {
     outs() << indexstore::IndexStore::formatVersion() << '\n';
   }
+#endif
 
   if (options::Action == ActionType::AggregateAsJSON) {
     if (options::InputFiles.empty()) {