Handle non LValue base expressions.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43387 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CodeGen/CGExpr.cpp b/CodeGen/CGExpr.cpp
index b03caaa..1c8eda1 100644
--- a/CodeGen/CGExpr.cpp
+++ b/CodeGen/CGExpr.cpp
@@ -394,21 +394,18 @@
}
llvm::Value *BaseValue = NULL;
- if (const CallExpr *CE = dyn_cast<CallExpr>(BaseExpr)) {
- RValue Base = EmitCallExpr(CE);
- BaseValue = Base.getScalarVal();
- }
- else {
+ if (BaseExpr->isLvalue() == Expr::LV_Valid) {
LValue BaseLV = EmitLValue(BaseExpr);
BaseValue = BaseLV.getAddress();
-
+
if (E->isArrow()) {
QualType PTy = cast<PointerType>(BaseExpr->getType())->getPointeeType();
BaseValue = Builder.CreateBitCast(BaseValue,
- llvm::PointerType::get(ConvertType(PTy)),
+ llvm::PointerType::get(ConvertType(PTy)),
"tmp");
}
- }
+ } else
+ BaseValue = EmitScalarExpr(BaseExpr);
FieldDecl *Field = E->getMemberDecl();
unsigned idx = CGM.getTypes().getLLVMFieldNo(Field);