Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

README.md

@@ -14,9 +14,6 @@
 
 | **OS** | **Architecture** | **Build** |
 |---|:---:|:---:|
-|**[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/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)|

lib/FrontendTool/FrontendTool.cpp

@@ -1122,10 +1122,12 @@ static bool performCompile(CompilerInstance &Instance,
   if (Action == FrontendOptions::ActionType::Typecheck) {
     if (emitIndexData(Invocation, Instance))
       return true;
-    if (emitAnyWholeModulePostTypeCheckSupplementaryOutputs(Instance,
-                                                            Invocation,
-                                                            moduleIsPublic)) {
-      return true;
+    if (opts.InputsAndOutputs.isWholeModule()) {
+      if (emitAnyWholeModulePostTypeCheckSupplementaryOutputs(Instance,
+                                                              Invocation,
+                                                              moduleIsPublic)) {
+        return true;
+      }
     }
     return false;
   }

test/Index/Store/driver-index-with-auxiliary-outputs.swift

@@ -0,0 +1,35 @@
+// RUN: %empty-directory(%t)
+
+// This test is very deliberately *not* indexing the current file; we need to
+// make sure the frontend job doesn't try to emit the auxiliary outputs based
+// on the non-indexed files. (This is how Xcode currently constructs -index-file
+// invocations: take a normal build command and add extra arguments to it.)
+// RUN: %target-build-swift -index-file -index-file-path %S/Inputs/SwiftModuleA.swift %S/Inputs/SwiftModuleA.swift %s -index-store-path %t/idx -module-name driver_index -emit-objc-header-path %t/out.h -emit-module-interface-path %t/out.swiftinterface
+
+// RUN: test ! -f %t/out.h
+// RUN: test ! -f %t/out.swiftinterface
+// RUN: c-index-test core -print-unit %t/idx | %FileCheck %s
+
+// CHECK-LABEL: module-name: driver_index
+// CHECK: DEPEND START
+// CHECK-NOT: Record |
+// CHECK: Record | user | {{.+}}SwiftModuleA.swift
+// CHECK-NOT: Record |
+// CHECK: DEPEND END
+
+#if _runtime(_ObjC)
+
+// Do a stronger test here involving checking @objc
+import ObjectiveC
+
+public class PossiblyObjC: NSObject {
+  @objc public init(x: Int) {}
+}
+
+#else // _runtime(_ObjC)
+
+public class Boring {
+  init()
+}
+
+#endif // _runtime(_ObjC)