Skip to content

Commit e4076b3

Browse files
committed
---
yaml --- r: 294903 b: refs/heads/swift-5.1-branch c: 7171c28 h: refs/heads/master i: 294901: fac6665 294899: 8e42273 294895: b766fda
1 parent eeb1f1c commit e4076b3

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e
12421242
refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
12431243
refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
12441244
refs/heads/swift-5.1-old-llvm-branch: 9cef8175146f25b72806154b8a0f4a3f52e3e400
1245-
refs/heads/swift-5.1-branch: 89903881f594a606af1fcf6f7db362f101727e63
1245+
refs/heads/swift-5.1-branch: 7171c28197a3f75b8cb59e06eebef144bd3efc86
12461246
refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
12471247
refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e
12481248
refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-03-a: 4591c933063ddcb0d6cd6d0cdd01086b2f9b244d

branches/swift-5.1-branch/test/Parse/omit_return.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ struct SomeProtoConformer : SomeProto {
7676
func foo() -> String { "howdy" }
7777
}
7878

79-
class SomeClass {}
80-
8179
class Base {}
8280
class Derived : Base {}
8381

@@ -471,10 +469,6 @@ func ff_implicitOpenExistentialExpr(_ f: SomeProto) -> String {
471469
f.foo()
472470
}
473471

474-
func ff_implicitClassMetatypeToAnyObjectExpr() -> AnyObject {
475-
SomeClass.self
476-
}
477-
478472
func ff_implicitInjectIntoOptionalExpr(_ int: Int) -> Int? {
479473
int
480474
}

branches/swift-5.1-branch/test/Parse/omit_return_foundation.swift renamed to branches/swift-5.1-branch/test/Parse/omit_return_objc.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %target-swift-frontend %s -typecheck -verify
22

3+
// REQUIRES: objc_interop
4+
35
import Foundation
46

57
class DynamicSubscriptClass {
@@ -18,3 +20,9 @@ func ff_implicitKeyPathExpr() -> String {
1820
#keyPath(NSArray.count)
1921
}
2022

23+
class SomeClass {}
24+
25+
func ff_implicitClassMetatypeToAnyObjectExpr() -> AnyObject {
26+
SomeClass.self
27+
}
28+

0 commit comments

Comments
 (0)