Skip to content

Commit 006a016

Browse files
committed
[test] Remove a hackaround for supporting last year's SDKs.
We have much stronger dependencies on this year's SDKs now. rdar://problem/19494514 Swift SVN r29451
1 parent 3ad108b commit 006a016

File tree

5 files changed

+0
-30
lines changed

5 files changed

+0
-30
lines changed

test/1_stdlib/Reflection_objc.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,6 @@ class HasNumberQLO : CanaryBase {
255255
}
256256
}
257257

258-
// Hack to build with both older and newer SDKs.
259-
// rdar://problem/19494514
260-
extension UInt {
261-
static let OBJC_ASSOCIATION_RETAIN_NONATOMIC: UInt = 1
262-
}
263-
264258
class HasAttributedQLO : CanaryBase {
265259
@objc var debugQuickLookObject: AnyObject {
266260
let str = NSAttributedString(string: "attributed string")

test/Interpreter/SDK/CALayer.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ class Canary: NSObject {
1313

1414
var CanaryAssocObjectHandle: UInt8 = 0
1515

16-
// Hack to build with both older and newer SDKs.
17-
// rdar://problem/19494514
18-
extension UInt {
19-
static let OBJC_ASSOCIATION_RETAIN_NONATOMIC: UInt = 1
20-
}
21-
2216
// Attach an associated object with a loud deinit so we can see that the
2317
// error died.
2418
func hangCanary(o: AnyObject) {

test/Interpreter/SDK/c_pointers.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ class Canary: NSObject {
7373

7474
var CanaryAssocObjectHandle: UInt8 = 0
7575

76-
// Hack to build with both older and newer SDKs.
77-
// rdar://problem/19494514
78-
extension UInt {
79-
static let OBJC_ASSOCIATION_RETAIN_NONATOMIC: UInt = 1
80-
}
81-
8276
// Attach an associated object with a loud deinit so we can see that the
8377
// error died.
8478
func hangCanary(o: AnyObject) {

test/Interpreter/SDK/objc_dealloc.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ class Associated {
1818

1919
var token: Int8 = 0
2020

21-
// Hack to build with both older and newer SDKs.
22-
// rdar://problem/19494514
23-
extension UInt {
24-
static let OBJC_ASSOCIATION_RETAIN_NONATOMIC: UInt = 1
25-
}
26-
2721
autoreleasepool {
2822
let root = Root()
2923
objc_setAssociatedObject(root, &token, Associated(),

test/Interpreter/SDK/objc_inner_pointer.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ class Canary: NSObject {
1414
var CanaryAssocObjectHandle: UInt8 = 0
1515

1616

17-
// Hack to build with both older and newer SDKs.
18-
// rdar://problem/19494514
19-
extension UInt {
20-
static let OBJC_ASSOCIATION_RETAIN_NONATOMIC: UInt = 1
21-
}
22-
2317
// Attach an associated object with a loud deinit so we can see that the
2418
// object died.
2519
func hangCanary(o: AnyObject) {

0 commit comments

Comments
 (0)