Skip to content

Commit b850717

Browse files
committed
---
yaml --- r: 348543 b: refs/heads/master c: afeed79 h: refs/heads/master i: 348541: 96202ed 348539: 0470b62 348535: 3f631f6 348527: 6d82041 348511: d62ead5 348479: 9f2f4b7 348415: 50270cf
1 parent c2971a6 commit b850717

File tree

4 files changed

+42
-8
lines changed

4 files changed

+42
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: fd62567c550ddb564a4994ac8fc77de616f2ffc8
2+
refs/heads/master: afeed7929f68e36b2829361cf2d61bf5ede01aed
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414

1515
| **OS** | **Architecture** | **Build** |
1616
|---|:---:|:---:|
17-
|**[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)|
18-
|**[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)|
19-
|**[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)|
2017
|**[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)|
2118
|**[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)|
2219
|**[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)|

trunk/lib/FrontendTool/FrontendTool.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,10 +1122,12 @@ static bool performCompile(CompilerInstance &Instance,
11221122
if (Action == FrontendOptions::ActionType::Typecheck) {
11231123
if (emitIndexData(Invocation, Instance))
11241124
return true;
1125-
if (emitAnyWholeModulePostTypeCheckSupplementaryOutputs(Instance,
1126-
Invocation,
1127-
moduleIsPublic)) {
1128-
return true;
1125+
if (opts.InputsAndOutputs.isWholeModule()) {
1126+
if (emitAnyWholeModulePostTypeCheckSupplementaryOutputs(Instance,
1127+
Invocation,
1128+
moduleIsPublic)) {
1129+
return true;
1130+
}
11291131
}
11301132
return false;
11311133
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// RUN: %empty-directory(%t)
2+
3+
// This test is very deliberately *not* indexing the current file; we need to
4+
// make sure the frontend job doesn't try to emit the auxiliary outputs based
5+
// on the non-indexed files. (This is how Xcode currently constructs -index-file
6+
// invocations: take a normal build command and add extra arguments to it.)
7+
// 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
8+
9+
// RUN: test ! -f %t/out.h
10+
// RUN: test ! -f %t/out.swiftinterface
11+
// RUN: c-index-test core -print-unit %t/idx | %FileCheck %s
12+
13+
// CHECK-LABEL: module-name: driver_index
14+
// CHECK: DEPEND START
15+
// CHECK-NOT: Record |
16+
// CHECK: Record | user | {{.+}}SwiftModuleA.swift
17+
// CHECK-NOT: Record |
18+
// CHECK: DEPEND END
19+
20+
#if _runtime(_ObjC)
21+
22+
// Do a stronger test here involving checking @objc
23+
import ObjectiveC
24+
25+
public class PossiblyObjC: NSObject {
26+
@objc public init(x: Int) {}
27+
}
28+
29+
#else // _runtime(_ObjC)
30+
31+
public class Boring {
32+
init()
33+
}
34+
35+
#endif // _runtime(_ObjC)

0 commit comments

Comments
 (0)