diff options
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 7 | ||||
| -rw-r--r-- | lib/CodeGen/CGExprAgg.cpp | 4 | ||||
| -rw-r--r-- | lib/CodeGen/CGValue.h | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 4f2210f10e..93bc1753ce 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -1463,8 +1463,7 @@ void CodeGenFunction::EmitCallArg(CallArgList &args, const Expr *E, cast<CastExpr>(E)->getCastKind() == CK_LValueToRValue) { LValue L = EmitLValue(cast<CastExpr>(E)->getSubExpr()); assert(L.isSimple()); - args.add(RValue::getAggregate(L.getAddress(), L.isVolatileQualified()), - type, /*NeedsCopy*/true); + args.add(L.asAggregateRValue(), type, /*NeedsCopy*/true); return; } @@ -1518,7 +1517,7 @@ void CodeGenFunction::ExpandTypeToArgs(QualType Ty, RValue RV, // FIXME: Volatile? EltRV = RValue::getComplex(LoadComplexFromAddr(LV.getAddress(), false)); else if (CodeGenFunction::hasAggregateLLVMType(EltTy)) - EltRV = RValue::getAggregate(LV.getAddress()); + EltRV = LV.asAggregateRValue(); else EltRV = EmitLoadOfLValue(LV); ExpandTypeToArgs(EltTy, EltRV, Args, IRFuncTy); @@ -1539,7 +1538,7 @@ void CodeGenFunction::ExpandTypeToArgs(QualType Ty, RValue RV, // FIXME: Volatile? FldRV = RValue::getComplex(LoadComplexFromAddr(LV.getAddress(), false)); else if (CodeGenFunction::hasAggregateLLVMType(FT)) - FldRV = RValue::getAggregate(LV.getAddress()); + FldRV = LV.asAggregateRValue(); else FldRV = EmitLoadOfLValue(LV); ExpandTypeToArgs(FT, FldRV, Args, IRFuncTy); diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp index 0996339d3a..c55630da63 100644 --- a/lib/CodeGen/CGExprAgg.cpp +++ b/lib/CodeGen/CGExprAgg.cpp @@ -263,9 +263,7 @@ void AggExprEmitter::EmitFinalDestCopy(const Expr *E, RValue Src, bool Ignore) { void AggExprEmitter::EmitFinalDestCopy(const Expr *E, LValue Src, bool Ignore) { assert(Src.isSimple() && "Can't have aggregate bitfield, vector, etc"); - EmitFinalDestCopy(E, RValue::getAggregate(Src.getAddress(), - Src.isVolatileQualified()), - Ignore); + EmitFinalDestCopy(E, Src.asAggregateRValue(), Ignore); } //===----------------------------------------------------------------------===// diff --git a/lib/CodeGen/CGValue.h b/lib/CodeGen/CGValue.h index c83000bb97..fd85fb2489 100644 --- a/lib/CodeGen/CGValue.h +++ b/lib/CodeGen/CGValue.h @@ -300,6 +300,11 @@ public: R.Initialize(type, type.getQualifiers()); return R; } + + RValue asAggregateRValue() const { + // FIMXE: Alignment + return RValue::getAggregate(getAddress(), isVolatileQualified()); + } }; /// An aggregate value slot. |