[llvm-branch-commits] [cfe-branch] r73534 - /cfe/branches/Apple/Dib/lib/CodeGen/CGExprComplex.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Jun 16 14:26:16 2009
New Revision: 73534

URL: http://llvm.org/viewvc/llvm-project?rev=73534&view=rev
Log:
Fix merge of 73158, the volatile changes from 72572 aren't on this branch.

Modified:
    cfe/branches/Apple/Dib/lib/CodeGen/CGExprComplex.cpp

Modified: cfe/branches/Apple/Dib/lib/CodeGen/CGExprComplex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/CodeGen/CGExprComplex.cpp?rev=73534&r1=73533&r2=73534&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/CodeGen/CGExprComplex.cpp (original)
+++ cfe/branches/Apple/Dib/lib/CodeGen/CGExprComplex.cpp Tue Jun 16 14:26:16 2009
@@ -472,11 +472,6 @@
   if (LHS.isSimple()) {
     EmitStoreOfComplex(Val, LHS.getAddress(), LHS.isVolatileQualified());
 
-    // And now return the LHS
-    IgnoreReal = ignreal;
-    IgnoreImag = ignimag;
-    IgnoreRealAssign = ignreal;
-    IgnoreImagAssign = ignimag;
     return EmitLoadOfComplex(LHS.getAddress(), LHS.isVolatileQualified());
   }
   
@@ -485,13 +480,6 @@
     CGF.EmitObjCPropertySet(LHS.getPropertyRefExpr(), RValue::getComplex(Val));
   else
     CGF.EmitObjCPropertySet(LHS.getKVCRefExpr(), RValue::getComplex(Val));
-
-  // There is no reload after a store through a method, but we need to restore
-  // the Ignore* flags.
-  IgnoreReal = ignreal;
-  IgnoreImag = ignimag;
-  IgnoreRealAssign = ignreal;
-  IgnoreImagAssign = ignimag;
   return Val;
 }