From 0a96118bb8cec6224aef53f001a0a4f87a7be8fb Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Fri, 26 Oct 2007 18:15:21 +0000 Subject: [PATCH] Handle non LValue base expressions. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43387 91177308-0d34-0410-b5e6-96231b3b80d8 --- CodeGen/CGExpr.cpp | 13 +++++-------- 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(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(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; +} -- 2.40.0