[llvm-commits] [llvm-gcc-4.2] r49421 - in /llvm-gcc-4.2/trunk/gcc: llvm-convert.cpp llvm-types.cpp

[Duncan Sands]

Author: baldrick
Date: Wed Apr  9 04:30:27 2008
New Revision: 49421

URL: http://llvm.org/viewvc/llvm-project?rev=49421&view=rev
Log:
Silence gcc-4.4 warnings.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-types.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=49421&r1=49420&r2=49421&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Wed Apr  9 04:30:27 2008
@@ -1828,7 +1828,7 @@
     }
   }
 
-  if (DefaultDest)
+  if (DefaultDest) {
     if (SI->getSuccessor(0) == Builder.GetInsertBlock())
       SI->setSuccessor(0, DefaultDest);
     else {
@@ -1836,6 +1836,7 @@
       // Emit a "fallthrough" block, which is almost certainly dead.
       EmitBlock(BasicBlock::Create(""));
     }
+  }
 
   return 0;
 }
@@ -6107,7 +6108,7 @@
       } else {
         // If this is little-endian bit-field, take the bottom NumBitsToInsert
         // bits from the bitfield value.
-        EltValToInsert = ValToInsert & (1ULL << NumEltBitsToInsert)-1;
+        EltValToInsert = ValToInsert & ((1ULL << NumEltBitsToInsert)-1);
         ValToInsert >>= NumEltBitsToInsert;
       }
 
@@ -6205,7 +6206,7 @@
     } else {
       // If this is little-endian bit-field, take the bottom NumBitsToInsert
       // bits from the bitfield value.
-      ValToInsert = BitfieldVal & (1ULL << NumBitsToInsert)-1;
+      ValToInsert = BitfieldVal & ((1ULL << NumBitsToInsert)-1);
       BitfieldVal >>= NumBitsToInsert;
     }
     
@@ -6297,9 +6298,9 @@
       assert(FieldNo < ResultElts.size() && "Invalid struct field number!");
 
       // Example: struct X { int A; char C[]; } x = { 4, "foo" };
-      assert(TYPE_SIZE(getDeclaredType(Field)) ||
+      assert((TYPE_SIZE(getDeclaredType(Field)) ||
              (FieldNo == ResultElts.size()-1 &&
-              isStructWithVarSizeArrayAtEnd(STy))
+              isStructWithVarSizeArrayAtEnd(STy)))
              && "field with no size is not array at end of struct!");
 
       // If this is an initialization of a global that ends with a variable
@@ -6498,7 +6499,7 @@
 
   // Check for variable sized reference.
   // FIXME: add support for array types where the size doesn't fit into 64 bits
-  assert(isArrayCompatible(ArrayType) || isSequentialCompatible(ArrayType)
+  assert((isArrayCompatible(ArrayType) || isSequentialCompatible(ArrayType))
          && "Cannot have globals with variable size!");
 
   // As an LLVM extension, we allow ARRAY_REF with a pointer as the first

Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp?rev=49421&r1=49420&r2=49421&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Wed Apr  9 04:30:27 2008
@@ -245,11 +245,12 @@
 /// the specified type.
 static std::string GetTypeName(const char *Prefix, tree type) {
   const char *Name = "anon";
-  if (TYPE_NAME(type))
+  if (TYPE_NAME(type)) {
     if (TREE_CODE(TYPE_NAME(type)) == IDENTIFIER_NODE)
       Name = IDENTIFIER_POINTER(TYPE_NAME(type));
     else if (DECL_NAME(TYPE_NAME(type)))
       Name = IDENTIFIER_POINTER(DECL_NAME(TYPE_NAME(type)));
+  }
   
   std::string ContextStr;
   tree Context = TYPE_CONTEXT(type);