[ConstraintSystem] Fail closure resolution if one of the parameters has invalid property wrapper

xedin · xedin · commit 48bbeaaf8db0 · 2022-04-29T10:19:59.000-07:00
(cherry picked from commit 0e4d16d)
diff --git a/lib/Sema/CSSimplify.cpp b/lib/Sema/CSSimplify.cpp
@@ -9903,8 +9903,9 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,
       }
 
       if (!paramDecl->getName().hasDollarPrefix()) {
-        generateWrappedPropertyTypeConstraints(paramDecl, backingType,
-                                               param.getParameterType());
+        if (generateWrappedPropertyTypeConstraints(paramDecl, backingType,
+                                                   param.getParameterType()))
+          return false;
       }
 
       auto result = applyPropertyWrapperToParameter(backingType, param.getParameterType(),

Original file line number	Diff line number	Diff line change
`@@ -9903,8 +9903,9 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,`
`9903`	`9903`	`}`
`9904`	`9904`
`9905`	`9905`	`if (!paramDecl->getName().hasDollarPrefix()) {`
`9906`		`- generateWrappedPropertyTypeConstraints(paramDecl, backingType,`
`9907`		`- param.getParameterType());`
	`9906`	`+ if (generateWrappedPropertyTypeConstraints(paramDecl, backingType,`
	`9907`	`+ param.getParameterType()))`
	`9908`	`+ return false;`
`9908`	`9909`	`}`
`9909`	`9910`
`9910`	`9911`	`auto result = applyPropertyWrapperToParameter(backingType, param.getParameterType(),`