diff options
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index ff3fdd5692..2a544c5609 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -1600,16 +1600,14 @@ RValue CodeGenFunction::EmitCall(llvm::Value *Callee, QualType CalleeType, LValue CodeGenFunction:: EmitPointerToDataMemberBinaryExpr(const BinaryOperator *E) { - llvm::Value *BaseV = EmitLValue(E->getLHS()).getAddress(); + llvm::Value *BaseV; if (E->getOpcode() == BinaryOperator::PtrMemI) - BaseV = Builder.CreateLoad(BaseV, "indir.ptr"); + BaseV = EmitScalarExpr(E->getLHS()); + else + BaseV = EmitLValue(E->getLHS()).getAddress(); const llvm::Type *i8Ty = llvm::Type::getInt8PtrTy(getLLVMContext()); BaseV = Builder.CreateBitCast(BaseV, i8Ty); - LValue RHSLV = EmitLValue(E->getRHS()); - llvm::Value *OffsetV = - EmitLoadOfLValue(RHSLV, E->getRHS()->getType()).getScalarVal(); - const llvm::Type* ResultType = ConvertType(getContext().getPointerDiffType()); - OffsetV = Builder.CreateBitCast(OffsetV, ResultType); + llvm::Value *OffsetV = EmitScalarExpr(E->getRHS()); llvm::Value *AddV = Builder.CreateInBoundsGEP(BaseV, OffsetV, "add.ptr"); QualType Ty = E->getRHS()->getType(); |