Revert "[Generic environment] Weaken an assertion when forming a substitution map."

DougGregor · DougGregor · commit 5f4b2cfec0a3 · 2017-02-23T10:43:10.000-08:00
This reverts commit 485ed7b. The original assertion should now suffice.
diff --git a/lib/AST/GenericEnvironment.cpp b/lib/AST/GenericEnvironment.cpp
@@ -412,9 +412,7 @@ getSubstitutionMap(SubstitutionList subs) const {
       continue;
     }
 
-    // FIXME: getAllDependentTypes() includes generic type parameters that
-    // have been made concrete.
-    assert(contextTy->hasError() || depTy->is<GenericTypeParamType>());
+    assert(contextTy->hasError());
   }
 
   assert(subs.empty() && "did not use all substitutions?!");

Original file line number	Diff line number	Diff line change
`@@ -412,9 +412,7 @@ getSubstitutionMap(SubstitutionList subs) const {`
`412`	`412`	`continue;`
`413`	`413`	`}`
`414`	`414`
`415`		`- // FIXME: getAllDependentTypes() includes generic type parameters that`
`416`		`- // have been made concrete.`
`417`		`- assert(contextTy->hasError() \|\| depTy->is<GenericTypeParamType>());`
	`415`	`+ assert(contextTy->hasError());`
`418`	`416`	`}`
`419`	`417`
`420`	`418`	`assert(subs.empty() && "did not use all substitutions?!");`