commit 42330c38e3f36c151e192fd0ee107251aa2e7c37
author Chris Lattner <sabre@nondot.org> Sat Aug 25 21:56:20 2007 +0000
committer Chris Lattner <sabre@nondot.org> Sat Aug 25 21:56:20 2007 +0000
tree a22d85fdceaa094d9bbc63ccddf916b71ec944a0
parent b2f9f554babdd92cd94186ad297797c57366da76

The new correct compound assignment operators exposed a bug in codegen.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41405 91177308-0d34-0410-b5e6-96231b3b80d8

CodeGen/CGExprScalar.cpp

diff --git a/CodeGen/CGExprScalar.cpp b/CodeGen/CGExprScalar.cpp
index c10e510..889842e 100644
--- a/CodeGen/CGExprScalar.cpp
+++ b/CodeGen/CGExprScalar.cpp
@@ -430,8 +430,8 @@
                                   ComputeType).getVal();
   
   // Do not merge types for -= where the LHS is a pointer.
-  if (E->getOpcode() != BinaryOperator::SubAssign &&
-      E->getLHS()->getType()->isPointerType()) {
+  if (E->getOpcode() != BinaryOperator::SubAssign ||
+      !E->getLHS()->getType()->isPointerType()) {
     OpInfo.RHS = CGF.EmitConversion(RValue::get(OpInfo.RHS), RHSTy,
                                     ComputeType).getVal();
   }