From f1b97f28a53ee09fa2bc38790d964cda3811bdc6 Mon Sep 17 00:00:00 2001 From: Mike Stump Date: Sat, 23 May 2009 21:40:07 +0000 Subject: [PATCH] More volatile fixes. Can't testcase these yet as ultimately volatile is still ignored. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72344 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExpr.cpp | 2 +- lib/CodeGen/CGExprAgg.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 2fe6754293..559bd4c60b 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -56,7 +56,7 @@ RValue CodeGenFunction::EmitAnyExpr(const Expr *E, llvm::Value *AggLoc, return RValue::getComplex(EmitComplexExpr(E)); EmitAggExpr(E, AggLoc, isAggLocVolatile); - return RValue::getAggregate(AggLoc); + return RValue::getAggregate(AggLoc, isAggLocVolatile); } /// EmitAnyExprToTemp - Similary to EmitAnyExpr(), however, the result diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp index b0551eb416..951a5f0e39 100644 --- a/lib/CodeGen/CGExprAgg.cpp +++ b/lib/CodeGen/CGExprAgg.cpp @@ -197,8 +197,8 @@ void AggExprEmitter::VisitObjCKVCRefExpr(ObjCKVCRefExpr *E) { } void AggExprEmitter::VisitBinComma(const BinaryOperator *E) { - CGF.EmitAnyExpr(E->getLHS()); - CGF.EmitAggExpr(E->getRHS(), DestPtr, false); + CGF.EmitAnyExprToTemp(E->getLHS(), 0, VolatileDest); + CGF.EmitAggExpr(E->getRHS(), DestPtr, VolatileDest); } void AggExprEmitter::VisitStmtExpr(const StmtExpr *E) { -- 2.40.0