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

Author: swift-ci

test/ClangImporter/MixedSource/Inputs/AutolinkingTest.framework/AutolinkingTest

@@ -0,0 +1,3 @@
+struct Test {
+  int value;
+};

test/ClangImporter/MixedSource/Inputs/AutolinkingTest.framework/Headers/AutolinkingTest.h

@@ -0,0 +1,5 @@
+framework module AutolinkingTest {
+  umbrella header "AutolinkingTest.h"
+  export *
+  module * { export * }
+}

test/ClangImporter/MixedSource/Inputs/AutolinkingTest.framework/Modules/module.modulemap

@@ -0,0 +1,16 @@
+// RUN: %target-swift-frontend %s -module-name AutolinkingTest -F %S/Inputs -import-underlying-module -emit-ir | %FileCheck %s
+
+// Linux uses a different autolinking mechanism, based on
+// swift-autolink-extract. This file tests the Darwin mechanism.
+// UNSUPPORTED: OS=linux-gnu
+// UNSUPPORTED: OS=linux-gnueabihf
+// UNSUPPORTED: OS=freebsd
+// UNSUPPORTED: OS=linux-androideabi
+
+// Use a type declared in the Clang part of the module.
+public let y = Test()
+
+// CHECK: !llvm.linker.options
+// CHECK-NOT: !{!"-framework", !"AutolinkingTest"}
+// CHECK: !{!"-lswiftCore"}
+// CHECK-NOT: !{!"-framework", !"AutolinkingTest"}

test/ClangImporter/MixedSource/autolinking.swift

@@ -17,7 +17,7 @@
 // RUN: %target-build-swift -typecheck -disable-bridging-pch  -driver-print-jobs -import-objc-header %S/Inputs/bridging-header.h %s 2>&1 | %FileCheck %s -check-prefix=NOPCHJOB
 // NOPCHJOB: {{.*}}swift -frontend {{.*}} -import-objc-header {{.*}}Inputs/bridging-header.h
 
-// RUN: echo "{\"\": {\"swift-dependencies\": \"master.swiftdeps\"}}" > %t.json
+// RUN: echo "{\"\": {\"swift-dependencies\": \"%t/master.swiftdeps\"}, \"%s\": {\"swift-dependencies\": \"%t/bridging-header.swiftdeps\"}}" > %t.json
 // RUN: %target-build-swift -typecheck -incremental -enable-bridging-pch -output-file-map %t.json -import-objc-header %S/Inputs/bridging-header.h %s
 
 // RUN: mkdir %t/tmp

test/Driver/bridging-pch.swift

@@ -3,10 +3,10 @@
 // RUN: echo "{\"%s\": {\"assembly\": \"/build/multi-threaded.s\"}, \"%S/Inputs/main.swift\": {\"assembly\": \"/build/main.s\"}}" > %t/ofms.json
 // RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -output-file-map %t/ofms.json -S | %FileCheck -check-prefix=ASSEMBLY %s
 // RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -c | %FileCheck -check-prefix=OBJECT %s
-// RUN: %target-swiftc_driver -parseable-output -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -c 2> %t/parseable-output
+// RUN: (cd %t && %target-swiftc_driver -parseable-output -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -c) 2> %t/parseable-output
 // RUN: cat %t/parseable-output | %FileCheck -check-prefix=PARSEABLE %s
 // RUN: (cd %t && env TMPDIR=/tmp %swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -o a.out ) | %FileCheck -check-prefix=EXEC %s
-// RUN: echo "{\"%s\": {\"llvm-bc\": \"multi-threaded.bc\", \"object\": \"%t/multi-threaded.o\"}, \"%S/Inputs/main.swift\": {\"llvm-bc\": \"main.bc\", \"object\": \"%t/main.o\"}}" > %t/ofmo.json
+// RUN: echo "{\"%s\": {\"llvm-bc\": \"%t/multi-threaded.bc\", \"object\": \"%t/multi-threaded.o\"}, \"%S/Inputs/main.swift\": {\"llvm-bc\": \"%t/main.bc\", \"object\": \"%t/main.o\"}}" > %t/ofmo.json
 // RUN: %target-swiftc_driver -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s  -emit-dependencies -output-file-map %t/ofmo.json -c
 // RUN: cat %t/*.d | %FileCheck -check-prefix=DEPENDENCIES %s
 
@@ -42,9 +42,9 @@
 // BITCODE: -frontend
 // BITCODE-DAG: -num-threads 4
 // BITCODE-DAG: {{[^ ]*}}/Inputs/main.swift {{[^ ]*}}/multi-threaded.swift 
-// BITCODE-DAG: -o main.bc -o multi-threaded.bc
-// BITCODE-DAG: -frontend -c -primary-file main.bc {{.*}} -o {{[^ ]*}}main.o
-// BITCODE-DAG: -frontend -c -primary-file multi-threaded.bc {{.*}} -o {{[^ ]*}}multi-threaded.o
+// BITCODE-DAG: -o {{.*}}/main.bc -o {{.*}}/multi-threaded.bc
+// BITCODE-DAG: -frontend -c -primary-file {{.*}}/main.bc {{.*}} -o {{[^ ]*}}main.o
+// BITCODE-DAG: -frontend -c -primary-file {{.*}}/multi-threaded.bc {{.*}} -o {{[^ ]*}}multi-threaded.o
 // BITCODE-NOT: ld
 
 // PARSEABLE: "outputs": [
@@ -63,16 +63,16 @@
 
 // PARSEABLE2: "name": "compile"
 // PARSEABLE2: "outputs": [
-// PARSEABLE2: "path": "main.bc"
-// PARSEABLE2: "path": "multi-threaded.bc"
+// PARSEABLE2: "path": "{{.*}}/main.bc"
+// PARSEABLE2: "path": "{{.*}}/multi-threaded.bc"
 // PARSEABLE2: "name": "backend"
 // PARSEABLE2: "inputs": [
-// PARSEABLE2:   "main.bc"
+// PARSEABLE2:   "{{.*}}/main.bc"
 // PARSEABLE2: "outputs": [
 // PARSEABLE2:   "path": "{{.*}}/main.o"
 // PARSEABLE2: "name": "backend"
 // PARSEABLE2: "inputs": [
-// PARSEABLE2:   "multi-threaded.bc"
+// PARSEABLE2:   "{{.*}}/multi-threaded.bc"
 // PARSEABLE2: "outputs": [
 // PARSEABLE2:   "path": "{{.*}}/multi-threaded.o"