Skip to content

Commit 4b3983c

Browse files
committed
---
yaml --- r: 347132 b: refs/heads/master c: d84eee2 h: refs/heads/master
1 parent feeaeaa commit 4b3983c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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: 43fd0c50a53ce6a59923c6ee691743407ae5bea7
2+
refs/heads/master: d84eee26b9166167ad4779b9ffa50b90435413f1
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/Sema/TypeCheckConstraints.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3909,7 +3909,7 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
39093909
auto toConstrainedArchetype = false;
39103910
if (toArchetypeType) {
39113911
auto archetype = toType->castTo<ArchetypeType>();
3912-
toConstrainedArchetype = archetype && !archetype->getConformsTo().empty();
3912+
toConstrainedArchetype = !archetype->getConformsTo().empty();
39133913
}
39143914

39153915
if (fromFunctionType &&

0 commit comments

Comments
 (0)