SILGen: Simplify getBaseFormalType()

slavapestov · slavapestov · commit 53ff62ee40e8 · 2018-09-25T23:12:46.000-07:00
diff --git a/lib/SILGen/SILGenLValue.cpp b/lib/SILGen/SILGenLValue.cpp
@@ -2748,14 +2748,7 @@ static SGFAccessKind getBaseAccessKind(SILGenModule &SGM,
 }
 
 static CanType getBaseFormalType(Expr *baseExpr) {
-  auto type = baseExpr->getType()->getCanonicalType();
-  if (auto lv = dyn_cast<LValueType>(type)) {
-    return lv.getObjectType();
-  } else if (auto inout = dyn_cast<InOutType>(type)) {
-    return inout.getObjectType();
-  } else {
-    return type;
-  }
+  return baseExpr->getType()->getWithoutSpecifierType()->getCanonicalType();
 }
 
 LValue SILGenLValue::visitMemberRefExpr(MemberRefExpr *e,

Original file line number	Diff line number	Diff line change
`@@ -2748,14 +2748,7 @@ static SGFAccessKind getBaseAccessKind(SILGenModule &SGM,`
`2748`	`2748`	`}`
`2749`	`2749`
`2750`	`2750`	`static CanType getBaseFormalType(Expr *baseExpr) {`
`2751`		`- auto type = baseExpr->getType()->getCanonicalType();`
`2752`		`- if (auto lv = dyn_cast<LValueType>(type)) {`
`2753`		`- return lv.getObjectType();`
`2754`		`- } else if (auto inout = dyn_cast<InOutType>(type)) {`
`2755`		`- return inout.getObjectType();`
`2756`		`- } else {`
`2757`		`- return type;`
`2758`		`- }`
	`2751`	`+ return baseExpr->getType()->getWithoutSpecifierType()->getCanonicalType();`
`2759`	`2752`	`}`
`2760`	`2753`
`2761`	`2754`	`LValue SILGenLValue::visitMemberRefExpr(MemberRefExpr *e,`