[Function builder] Eliminate unnecessary dependency on UnderlyingTypeForOpaqueReturnType.

DougGregor · DougGregor · commit cc44f22f43a7 · 2020-01-27T15:01:09.000-08:00
diff --git a/lib/Sema/BuilderTransform.cpp b/lib/Sema/BuilderTransform.cpp
@@ -1041,7 +1041,6 @@ Optional<BraceStmt *> TypeChecker::applyFunctionBuilderBodyTransform(
   ConstraintKind resultConstraintKind = ConstraintKind::Conversion;
   if (auto opaque = resultContextType->getAs<OpaqueTypeArchetypeType>()) {
     if (opaque->getDecl()->isOpaqueReturnTypeOfFunction(func)) {
-      options |= ConstraintSystemFlags::UnderlyingTypeForOpaqueReturnType;
       resultConstraintKind = ConstraintKind::OpaqueUnderlyingType;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,6 @@ Optional<BraceStmt *> TypeChecker::applyFunctionBuilderBodyTransform(`
`1041`	`1041`	`ConstraintKind resultConstraintKind = ConstraintKind::Conversion;`
`1042`	`1042`	`if (auto opaque = resultContextType->getAs<OpaqueTypeArchetypeType>()) {`
`1043`	`1043`	`if (opaque->getDecl()->isOpaqueReturnTypeOfFunction(func)) {`
`1044`		`- options \|= ConstraintSystemFlags::UnderlyingTypeForOpaqueReturnType;`
`1045`	`1044`	`resultConstraintKind = ConstraintKind::OpaqueUnderlyingType;`
`1046`	`1045`	`}`
`1047`	`1046`	`}`