Merge pull request #11900 from gottesmm/pr-f4bf802f3118863926bd5f488869e03202fcf30d

swift-ci · web-flow · commit c663b7cfd1cf · 2017-09-13T14:37:54.000-07:00
diff --git a/lib/SIL/SILOpenedArchetypesTracker.cpp b/lib/SIL/SILOpenedArchetypesTracker.cpp
@@ -28,7 +28,7 @@ void SILOpenedArchetypesTracker::addOpenedArchetypeDef(CanArchetypeType archetyp
       OldDef = SILValue();
     }
   }
-  assert(!OldDef &&
+  assert((!OldDef || OldDef == Def) &&
          "There can be only one definition of an opened archetype");
   OpenedArchetypeDefs[archetype] = Def;
 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ void SILOpenedArchetypesTracker::addOpenedArchetypeDef(CanArchetypeType archetyp`
`28`	`28`	`OldDef = SILValue();`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`- assert(!OldDef &&`
	`31`	`+ assert((!OldDef \|\| OldDef == Def) &&`
`32`	`32`	`"There can be only one definition of an opened archetype");`
`33`	`33`	`OpenedArchetypeDefs[archetype] = Def;`
`34`	`34`	`}`