diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-05-07 18:56:13 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-05-07 18:56:13 +0000 |
| commit | fdf474b05ef7a952e2046f8b44ede5690e05f385 (patch) | |
| tree | 2057aac11a3e3877c0986085e35a54f0705c529e /clang/lib | |
| parent | 8ae34dbd34bf0e2a96ce3a360e026c1077210e24 (diff) | |
| download | bcm5719-llvm-fdf474b05ef7a952e2046f8b44ede5690e05f385.tar.gz bcm5719-llvm-fdf474b05ef7a952e2046f8b44ede5690e05f385.zip | |
Fixes a Code gen crash trying to use a dot-syntax for
a property of a c++ class object (radar 7957369).
llvm-svn: 103279
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/CGExprCXX.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp index b57cdc93340..f35fe733d1d 100644 --- a/clang/lib/CodeGen/CGExprCXX.cpp +++ b/clang/lib/CodeGen/CGExprCXX.cpp @@ -273,8 +273,14 @@ CodeGenFunction::EmitCXXOperatorMemberCallExpr(const CXXOperatorCallExpr *E, const llvm::Type *Ty = CGM.getTypes().GetFunctionType(CGM.getTypes().getFunctionInfo(MD), FPT->isVariadic()); - - llvm::Value *This = EmitLValue(E->getArg(0)).getAddress(); + LValue LV = EmitLValue(E->getArg(0)); + llvm::Value *This; + if (LV.isPropertyRef()) { + RValue RV = EmitLoadOfPropertyRefLValue(LV, E->getArg(0)->getType()); + This = RV.isScalar() ? RV.getScalarVal() : RV.getAggregateAddr(); + } + else + This = LV.getAddress(); llvm::Value *Callee; if (MD->isVirtual() && !canDevirtualizeMemberFunctionCalls(E->getArg(0))) |
