[llvm-commits] [gcc-plugin] r82769 - /gcc-plugin/trunk/llvm-convert.cpp

[Duncan Sands]

Author: baldrick
Date: Fri Sep 25 10:21:35 2009
New Revision: 82769

URL: http://llvm.org/viewvc/llvm-project?rev=82769&view=rev
Log:
Make sure we don't get any warnings when assertions
are turned off.

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

Modified: gcc-plugin/trunk/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-convert.cpp?rev=82769&r1=82768&r2=82769&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-convert.cpp (original)
+++ gcc-plugin/trunk/llvm-convert.cpp Fri Sep 25 10:21:35 2009
@@ -2908,6 +2908,7 @@
     MemRef NewLoc = *DestLoc;
     NewLoc.Ptr = Builder.CreateBitCast(DestLoc->Ptr,PointerType::getUnqual(Ty));
     Value *OpVal = Emit(op, &NewLoc);
+    (void)OpVal;
     assert(OpVal == 0 && "Shouldn't cast scalar to aggregate!");
     return 0;
   }
@@ -2947,6 +2948,7 @@
     switch (TREE_CODE(Op)) {
     default: {
       Value *OpVal = Emit(Op, &Target);
+      (void)OpVal;
       assert(OpVal == 0 && "Expected an aggregate operand!");
       break;
     }
@@ -6301,6 +6303,7 @@
 
     if (!ConvertType(TREE_TYPE(tree_purpose))->isSingleValueType()) {
       Value *V = Emit(tree_value, DestLoc);
+      (void)V;
       assert(V == 0 && "Aggregate value returned in a register?");
     } else {
       // Scalar value.  Evaluate to a register, then do the store.
@@ -7338,14 +7341,14 @@
 
 Constant *TreeConstantToLLVM::EmitLV_ARRAY_REF(tree exp) {
   tree Array = TREE_OPERAND(exp, 0);
-  tree ArrayType = TREE_TYPE(Array);
   tree Index = TREE_OPERAND(exp, 1);
   tree IndexType = TREE_TYPE(Index);
-  assert(TREE_CODE(ArrayType) == ARRAY_TYPE && "Unknown ARRAY_REF!");
+  assert(TREE_CODE(TREE_TYPE(Array)) == ARRAY_TYPE && "Unknown ARRAY_REF!");
 
   // Check for variable sized reference.
   // FIXME: add support for array types where the size doesn't fit into 64 bits
-  assert(isSequentialCompatible(ArrayType) && "Global with variable size?");
+  assert(isSequentialCompatible(TREE_TYPE(Array)) &&
+         "Global with variable size?");
 
   Constant *ArrayAddr;
   // First subtract the lower bound, if any, in the type of the index.