[llvm-commits] [llvm-gcc-4.2] r54575 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

[Nick Lewycky]

Author: nicholas
Date: Fri Aug  8 23:30:40 2008
New Revision: 54575

URL: http://llvm.org/viewvc/llvm-project?rev=54575&view=rev
Log:
Apologies for checking in code that doesn't even compile.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54575&r1=54574&r2=54575&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug  8 23:30:40 2008
@@ -6984,9 +6984,10 @@
                                                       Idx.size());
 
   if (ConstantExpr *CE = dyn_cast<ConstantExpr>(ArrayRef))
-    return ConstantFoldConstantExpression(CE, &getTargetData()) || CE;
-  else
-    return ArrayRef;
+    if (Constant *C = ConstantFoldConstantExpression(CE, &getTargetData()))
+      return C;
+
+  return ArrayRef;
 }
 
 Constant *TreeConstantToLLVM::EmitLV_COMPONENT_REF(tree exp) {