[cfe-commits] r72344 - in /cfe/trunk/lib/CodeGen: CGExpr.cpp CGExprAgg.cpp

[Mike Stump]

Author: mrs
Date: Sat May 23 16:40:07 2009
New Revision: 72344

URL: http://llvm.org/viewvc/llvm-project?rev=72344&view=rev
Log:
More volatile fixes.  Can't testcase these yet as ultimately volatile
is still ignored.

Modified:
    cfe/trunk/lib/CodeGen/CGExpr.cpp
    cfe/trunk/lib/CodeGen/CGExprAgg.cpp

Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=72344&r1=72343&r2=72344&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Sat May 23 16:40:07 2009
@@ -56,7 +56,7 @@
     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

Modified: cfe/trunk/lib/CodeGen/CGExprAgg.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprAgg.cpp?rev=72344&r1=72343&r2=72344&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprAgg.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprAgg.cpp Sat May 23 16:40:07 2009
@@ -197,8 +197,8 @@
 }
 
 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) {