[TypeChecker/BuilderTransform] Switch to use hasLValueType instead of is<LValueType> to cover all cases where load is expected

xedin · xedin · commit 7453d53e48f4 · 2020-02-03T12:40:28.000-08:00
diff --git a/lib/Sema/BuilderTransform.cpp b/lib/Sema/BuilderTransform.cpp
@@ -693,7 +693,7 @@ class BuilderClosureRewriter
       declRef->setType(LValueType::get(temporaryVar->getType()));
 
       // Load the right-hand side if needed.
-      if (finalCapturedExpr->getType()->is<LValueType>()) {
+      if (finalCapturedExpr->getType()->hasLValueType()) {
         finalCapturedExpr =
             TypeChecker::addImplicitLoadExpr(ctx, finalCapturedExpr);
       }
@@ -839,7 +839,7 @@ class BuilderClosureRewriter
         auto finalCondExpr = rewriteExpr(condExpr);
 
         // Load the condition if needed.
-        if (finalCondExpr->getType()->is<LValueType>()) {
+        if (finalCondExpr->getType()->hasLValueType()) {
           finalCondExpr = TypeChecker::addImplicitLoadExpr(ctx, finalCondExpr);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -693,7 +693,7 @@ class BuilderClosureRewriter`
`693`	`693`	`declRef->setType(LValueType::get(temporaryVar->getType()));`
`694`	`694`
`695`	`695`	`// Load the right-hand side if needed.`
`696`		`- if (finalCapturedExpr->getType()->is<LValueType>()) {`
	`696`	`+ if (finalCapturedExpr->getType()->hasLValueType()) {`
`697`	`697`	`finalCapturedExpr =`
`698`	`698`	`TypeChecker::addImplicitLoadExpr(ctx, finalCapturedExpr);`
`699`	`699`	`}`
`@@ -839,7 +839,7 @@ class BuilderClosureRewriter`
`839`	`839`	`auto finalCondExpr = rewriteExpr(condExpr);`
`840`	`840`
`841`	`841`	`// Load the condition if needed.`
`842`		`- if (finalCondExpr->getType()->is<LValueType>()) {`
	`842`	`+ if (finalCondExpr->getType()->hasLValueType()) {`
`843`	`843`	`finalCondExpr = TypeChecker::addImplicitLoadExpr(ctx, finalCondExpr);`
`844`	`844`	`}`
`845`	`845`