Merge pull request swiftlang#21506 from DougGregor/dynamic-replacement-ambiguity-cleanup

swift-ci · web-flow · commit c12e06268119 · 2018-12-21T14:21:55.000-08:00
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -2068,8 +2068,8 @@ static Type getDynamicComparisonType(ValueDecl *value) {
   }
 
   auto interfaceType = value->getInterfaceType();
-  if (interfaceType->hasError())
-    return interfaceType;
+  if (!interfaceType)
+    return ErrorType::get(value->getASTContext());
 
   return interfaceType->removeArgumentLabels(numArgumentLabels);
 }

Original file line number	Diff line number	Diff line change
`@@ -2068,8 +2068,8 @@ static Type getDynamicComparisonType(ValueDecl *value) {`
`2068`	`2068`	`}`
`2069`	`2069`
`2070`	`2070`	`auto interfaceType = value->getInterfaceType();`
`2071`		`- if (interfaceType->hasError())`
`2072`		`- return interfaceType;`
	`2071`	`+ if (!interfaceType)`
	`2072`	`+ return ErrorType::get(value->getASTContext());`
`2073`	`2073`
`2074`	`2074`	`return interfaceType->removeArgumentLabels(numArgumentLabels);`
`2075`	`2075`	`}`