Skip to content

Commit 840f25d

Browse files
compnerdcompnerd
committed
---
yaml --- r: 347902 b: refs/heads/master c: f33fa6b h: refs/heads/master
1 parent 1ab3b73 commit 840f25d

21 files changed

+21
-87
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: 6cc7251509ba503edbfe095240214197c26d2f97
2+
refs/heads/master: f33fa6b0378dca4d75f892aab2c06ae74da88b21
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/lib/IRGen/GenDecl.cpp

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2398,8 +2398,7 @@ llvm::Function *IRGenModule::getAddrOfSILFunction(
23982398

23992399
static llvm::GlobalVariable *createGOTEquivalent(IRGenModule &IGM,
24002400
llvm::Constant *global,
2401-
LinkEntity entity)
2402-
{
2401+
LinkEntity entity) {
24032402
// Determine the name of this entity.
24042403
llvm::SmallString<64> globalName;
24052404
entity.mangle(globalName);
@@ -2422,17 +2421,7 @@ static llvm::GlobalVariable *createGOTEquivalent(IRGenModule &IGM,
24222421
llvm::GlobalValue::PrivateLinkage,
24232422
global,
24242423
llvm::Twine("got.") + globalName);
2425-
2426-
// rdar://problem/50968433: Unnamed_addr constants appear to get emitted
2427-
// with incorrect alignment by the LLVM JIT in some cases. Don't use
2428-
// unnamed_addr as a workaround.
2429-
if (!IGM.getOptions().UseJIT) {
2430-
gotEquivalent->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
2431-
} else {
2432-
ApplyIRLinkage(IRLinkage::InternalLinkOnceODR)
2433-
.to(gotEquivalent);
2434-
}
2435-
2424+
gotEquivalent->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
24362425
return gotEquivalent;
24372426
}
24382427

‎trunk/test/Interpreter/SDK/objc_getClass.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ testSuite.test("GenericMangled")
179179
reason: "objc_getClass hook not present"))
180180
.requireOwnProcess()
181181
.code {
182-
guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else { return }
183182
requireClass(named: "_TtC4main24ConstrainedSwiftSubclass",
184183
demangledName: "main.ConstrainedSwiftSubclass")
185184
requireClass(named: "_TtC4main26ConstrainedSwiftSuperclass",

‎trunk/test/Interpreter/external_key_path_ref.swift

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎trunk/test/ParseableInterface/ModuleCache/RebuildRemarks/out-of-date-cached-module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// RUN: %target-swift-frontend -typecheck %s -I %t/Build -module-cache-path %t/ModuleCache
1212

1313
// 4. Touch the interface so the cached module is no longer up-to-date
14-
// RUN: %{python} %S/../Inputs/make-old.py %t/Build/TestModule.swiftinterface
14+
// RUN: touch %t/Build/TestModule.swiftinterface
1515

1616
// 5. Try to import the now out-of-date cached module
1717
// RUN: %target-swift-frontend -typecheck -verify %s -I %t/Build -Rmodule-interface-rebuild -module-cache-path %t/ModuleCache

‎trunk/test/ParseableInterface/ModuleCache/RebuildRemarks/out-of-date-compiled-module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// RUN: %target-swift-frontend -compile-module-from-interface -o %t/Build/TestModule.swiftmodule %t/Build/TestModule.swiftinterface
1212

1313
// 4. Touch the interface so the module is no longer up-to-date
14-
// RUN: %{python} %S/../Inputs/make-old.py %t/Build/TestModule.swiftinterface
14+
// RUN: touch %t/Build/TestModule.swiftinterface
1515

1616
// 5. Try to import the out-of-date compiled module
1717
// RUN: %target-swift-frontend -typecheck -verify %s -I %t/Build -Rmodule-interface-rebuild -module-cache-path %t/ModuleCache

‎trunk/test/ParseableInterface/ModuleCache/RebuildRemarks/rebuild-transitive-import.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// RUN: %target-swift-frontend -compile-module-from-interface -o %t/Build/InnerModule.swiftmodule %t/Build/InnerModule.swiftinterface
1010

1111
// 3. Touch the interface so the module becomes out of date.
12-
// RUN: %{python} %S/../Inputs/make-old.py %t/Build/InnerModule.swiftinterface
12+
// RUN: touch %t/Build/InnerModule.swiftinterface
1313

1414
// 4. Create a module called OuterModule that imports InnerModule, and put its interface into the build dir.
1515
// RUN: echo 'import InnerModule' | %target-swift-frontend - -emit-module -o %t/Build/OuterModule.swiftmodule -module-name OuterModule -I %t/Build

‎trunk/test/Inputs/not.py renamed to ‎trunk/test/PlaygroundTransform/Inputs/not.py

File renamed without changes.

‎trunk/test/PlaygroundTransform/implicit_return_never.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: cp %s %t/main.swift
33
// RUN: %target-build-swift -Xfrontend -playground -Xfrontend -disable-playground-transform -o %t/main %t/main.swift
44
// RUN: %target-codesign %t/main
5-
// RUN: %{python} %S/../Inputs/not.py "%target-run %t/main --crash" 2>&1 | %FileCheck -check-prefix=CRASH-CHECK %s
5+
// RUN: %{python} %S/Inputs/not.py "%target-run %t/main --crash" 2>&1 | %FileCheck -check-prefix=CRASH-CHECK %s
66
// REQUIRES: executable_test
77

88
// NOTE: not.py is used above instead of "not --crash" because simctl's exit

‎trunk/test/PlaygroundTransform/placeholder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %target-build-swift -Xfrontend -playground -Xfrontend -disable-playground-transform -o %t/main %t/main.swift
44
// RUN: %target-codesign %t/main
55
// RUN: %target-run %t/main | %FileCheck %s
6-
// RUN: %{python} %S/../Inputs/not.py "%target-run %t/main --crash" 2>&1 | %FileCheck -check-prefix=CRASH-CHECK %s
6+
// RUN: %{python} %S/Inputs/not.py "%target-run %t/main --crash" 2>&1 | %FileCheck -check-prefix=CRASH-CHECK %s
77
// REQUIRES: executable_test
88

99
// NOTE: not.py is used above instead of "not --crash" because simctl's exit

‎trunk/test/PrintAsObjC/resilient-ancestry-stable-abi.swift

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎trunk/test/PrintAsObjC/resilient-ancestry.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
// RUN: %FileCheck %s --check-prefix=NO-STUBS < %t/resilient.h
1111
// RUN: %check-in-clang %t/resilient.h -I %t
1212

13-
// REQUIRES: objc_interop
13+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -module-name resilient -emit-objc-header-path %t/resilient.h -I %t -enable-library-evolution -enable-resilient-objc-class-stubs
14+
// RUN: %FileCheck %s < %t/resilient.h
15+
// RUN: %check-in-clang %t/resilient.h -I %t
1416

15-
// See also resilient-ancestry.swift, for the stable ABI deployment target test.
17+
// REQUIRES: objc_interop
1618

1719
import Foundation
1820
import resilient_objc_class

‎trunk/test/Runtime/backtrace.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-build-swift %s -o %t/a.out
3-
// RUN: %{python} %S/../Inputs/not.py "%target-run %t/a.out" 2>&1 | %{python} %utils/backtrace-check
4-
5-
// NOTE: not.py is used above instead of "not --crash" because %target-run
6-
// doesn't pass through the crash, and `not` may not be available when running
7-
// on a remote host.
3+
// RUN: not --crash %t/a.out 2>&1 | %{python} %utils/backtrace-check
84

95
// This is not supported on watchos, ios, or tvos
106
// UNSUPPORTED: OS=watchos

‎trunk/test/Runtime/crash_without_backtrace.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-build-swift %s -o %t/out
3-
// RUN: %{python} %S/../Inputs/not.py "%target-run %t/out" 2>&1 | %FileCheck %s
4-
5-
// NOTE: not.py is used above instead of "not --crash" because %target-run
6-
// doesn't pass through the crash, and `not` may not be available when running
7-
// on a remote host.
3+
// RUN: not --crash %t/out 2>&1 | %FileCheck %s
84

95
// UNSUPPORTED: OS=watchos
106
// UNSUPPORTED: OS=ios

‎trunk/test/Runtime/crash_without_backtrace_optimized.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-build-swift -O %s -o %t/out
3-
// RUN: %{python} %S/../Inputs/not.py "%target-run %t/out" 2>&1 | %FileCheck %s
4-
5-
// NOTE: not.py is used above instead of "not --crash" because %target-run
6-
// doesn't pass through the crash, and `not` may not be available when running
7-
// on a remote host.
3+
// RUN: not --crash %t/out 2>&1 | %FileCheck %s
84

95
// UNSUPPORTED: OS=watchos
106
// UNSUPPORTED: OS=ios

‎trunk/test/Runtime/linux-fatal-backtrace.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-build-swift %s -o %t/a.out
3-
// RUN: %{python} %S/../Inputs/not.py "%target-run %t/a.out" 2>&1 | PYTHONPATH=%lldb-python-path %{python} %utils/symbolicate-linux-fatal %t/a.out - | %{python} %utils/backtrace-check -u
3+
// RUN: not --crash %t/a.out 2>&1 | PYTHONPATH=%lldb-python-path %{python} %utils/symbolicate-linux-fatal %t/a.out - | %{python} %utils/backtrace-check -u
44
// REQUIRES: executable_test
55
// REQUIRES: OS=linux-gnu
66
// REQUIRES: lldb
77

8-
// NOTE: not.py is used above instead of "not --crash" because %target-run
9-
// doesn't pass through the crash, and `not` may not be available when running
10-
// on a remote host.
11-
128
// Backtraces are not emitted when optimizations are enabled. This test can not
139
// run when optimizations are enabled.
1410
// REQUIRES: swift_test_mode_optimize_none

‎trunk/test/decl/protocol/conforms/nscoding.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify
44
// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -disable-nskeyedarchiver-diagnostics 2>&1 | %FileCheck -check-prefix CHECK-NO-DIAGS %s
5+
56
// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -dump-ast -target %target-pre-stable-abi-triple > %t/old.ast
7+
// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -dump-ast -target %target-stable-abi-triple > %t/new.ast
68

79
// RUN: %FileCheck --check-prefix=CHECK-OLD %s < %t/old.ast
810
// RUN: %FileCheck --check-prefix=NEGATIVE %s < %t/old.ast
11+
// RUN: %FileCheck --check-prefix=NEGATIVE --check-prefix=NEGATIVE-NEW %s < %t/new.ast
912

1013
// REQUIRES: objc_interop
1114

12-
// See also nscoding_stable_abi.swift, for the stable ABI deployment
13-
// target test.
14-
1515
// CHECK-NO-DIAGS-NOT: NSCoding
1616
// CHECK-NO-DIAGS-NOT: unstable
1717

‎trunk/test/decl/protocol/conforms/nscoding_stable_abi.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎trunk/tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ collectASTModules(llvm::cl::list<std::string> &InputNames,
172172

173173
llvm::Expected<llvm::StringRef> ContentsReference = Section.getContents();
174174
if (!ContentsReference) {
175-
llvm::outs() << "error: " << name << " "
175+
llvm::errs() << "error: " << name << " "
176176
<< errorToErrorCode(OF.takeError()).message() << "\n";
177177
return false;
178178
}

‎trunk/utils/update_checkout/update-checkout-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
"cmark": "master",
308308
"llbuild": "swift-5.1-branch",
309309
"swiftpm": "swift-5.1-branch",
310-
"swift-syntax": "swift-5.1-branch-04-24-2019",
310+
"swift-syntax": "swift-5.1-branch",
311311
"swift-stress-tester": "swift-5.1-branch",
312312
"swift-corelibs-xctest": "swift-5.1-branch",
313313
"swift-corelibs-foundation": "swift-5.1-branch",

‎trunk/validation-test/Reflection/inherits_ObjCClasses.swift

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

1010
// REQUIRES: objc_interop
1111
// REQUIRES: executable_test
12-
// REQUIRES: OS=macosx || OS=ios || OS=tvos
13-
// NOTE: Test is temporarily disabled for watchOS until we can figure out why
14-
// it's failing there. rdar://problem/50898688
1512

1613
import simd
1714
import ObjCClasses

0 commit comments

Comments
 (0)