Merge pull request #23167 from theblixguy/chore/remove-useless-null-check

swift-ci · web-flow · commit 08b2ba0dd7c7 · 2019-03-07T15:43:25.000-08:00
diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
@@ -3909,7 +3909,7 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
   auto toConstrainedArchetype = false;
   if (toArchetypeType) {
     auto archetype = toType->castTo<ArchetypeType>();
-    toConstrainedArchetype = archetype && !archetype->getConformsTo().empty();
+    toConstrainedArchetype = !archetype->getConformsTo().empty();
   }
 
   if (fromFunctionType &&

Original file line number	Diff line number	Diff line change
`@@ -3909,7 +3909,7 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,`
`3909`	`3909`	`auto toConstrainedArchetype = false;`
`3910`	`3910`	`if (toArchetypeType) {`
`3911`	`3911`	`auto archetype = toType->castTo<ArchetypeType>();`
`3912`		`- toConstrainedArchetype = archetype && !archetype->getConformsTo().empty();`
	`3912`	`+ toConstrainedArchetype = !archetype->getConformsTo().empty();`
`3913`	`3913`	`}`
`3914`	`3914`
`3915`	`3915`	`if (fromFunctionType &&`