diff options
| -rw-r--r-- | CodeGen/CGExpr.cpp | 13 | ||||
| -rw-r--r-- | test/CodeGen/struct.c | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/CodeGen/CGExpr.cpp b/CodeGen/CGExpr.cpp index b03caaa666..1c8eda1f60 100644 --- a/CodeGen/CGExpr.cpp +++ b/CodeGen/CGExpr.cpp @@ -394,21 +394,18 @@ LValue CodeGenFunction::EmitMemberExpr(const MemberExpr *E) { } 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); diff --git a/test/CodeGen/struct.c b/test/CodeGen/struct.c index 4e73cd47af..443fc33ccb 100644 --- a/test/CodeGen/struct.c +++ b/test/CodeGen/struct.c @@ -59,3 +59,7 @@ extern NB *f3(); void f4() { f3()->d1 = 42; } + +void f5() { + (f3())->d1 = 42; +} |