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

[Chris Lattner]

Author: lattner
Date: Sun Jun 19 23:01:30 2011
New Revision: 133411

URL: http://llvm.org/viewvc/llvm-project?rev=133411&view=rev
Log:
Update to match mainline ConstantStruct::get API change.


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
    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-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=133411&r1=133410&r2=133411&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Sun Jun 19 23:01:30 2011
@@ -320,7 +320,8 @@
   }
 
   // Create string table.
-  Constant *LLVMValuesTable = ConstantStruct::get(Context, ValuesForPCH, false);
+  Constant *LLVMValuesTable =
+    ConstantStruct::getAnon(Context, ValuesForPCH, false);
 
   // Create variable to hold this string table.
   GlobalVariable *GV = new GlobalVariable(*TheModule, LLVMValuesTable->getType(),
@@ -918,7 +919,7 @@
     // __attribute__(constructor) can be on a function with any type.  Make sure
     // the pointer is void()*.
     StructInit[1] = TheFolder->CreateBitCast(Tors[i].first, FPTy);
-    InitList.push_back(ConstantStruct::get(Context, StructInit, false));
+    InitList.push_back(ConstantStruct::getAnon(StructInit));
   }
   Constant *Array = ConstantArray::get(
     ArrayType::get(InitList[0]->getType(), InitList.size()), InitList);
@@ -1345,7 +1346,7 @@
       };
  
       AttributeAnnotateGlobals.push_back(
-        ConstantStruct::get(Context, Element, 4, false));
+        ConstantStruct::getAnon(Context, Element));
     }
       
     // Get next annotate attribute.

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=133411&r1=133410&r2=133411&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Sun Jun 19 23:01:30 2011
@@ -7953,7 +7953,7 @@
   std::vector<Constant*> Elts;
   Elts.push_back(Convert(TREE_REALPART(exp)));
   Elts.push_back(Convert(TREE_IMAGPART(exp)));
-  return ConstantStruct::get(Context, Elts, false);
+  return ConstantStruct::getAnon(Elts);
 }
 
 Constant *TreeConstantToLLVM::ConvertNOP_EXPR(tree exp) {
@@ -8139,7 +8139,7 @@
   if (AllEltsSameType)
     return ConstantArray::get(
       ArrayType::get(ElTy, ResultElts.size()), ResultElts);
-  return ConstantStruct::get(Context, ResultElts, false);
+  return ConstantStruct::getAnon(Context, ResultElts);
 }
 
 
@@ -8582,8 +8582,8 @@
     LayoutInfo.HandleTailPadding(getInt64(StructTypeSizeTree, true));
 
   // Okay, we're done, return the computed elements.
-  return ConstantStruct::get(Context, LayoutInfo.ResultElts,
-                             LayoutInfo.StructIsPacked);
+  return ConstantStruct::getAnon(Context, LayoutInfo.ResultElts,
+                                 LayoutInfo.StructIsPacked);
 }
 
 Constant *TreeConstantToLLVM::ConvertUnionCONSTRUCTOR(tree exp) {
@@ -8651,8 +8651,8 @@
   if (UnionTypeSizeTree && TREE_CODE(UnionTypeSizeTree) == INTEGER_CST)
     LayoutInfo.HandleTailPadding(getInt64(UnionTypeSizeTree, true));
 
-  return ConstantStruct::get(Context, LayoutInfo.ResultElts,
-                             LayoutInfo.StructIsPacked);
+  return ConstantStruct::getAnon(Context, LayoutInfo.ResultElts,
+                                 LayoutInfo.StructIsPacked);
 }
 
 //===----------------------------------------------------------------------===//

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=133411&r1=133410&r2=133411&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Sun Jun 19 23:01:30 2011
@@ -200,7 +200,8 @@
   }
 
   // Create string table.
-  Constant *LTypesNameTable = ConstantStruct::get(Context, LTypesNames, false);
+  Constant *LTypesNameTable =
+    ConstantStruct::getAnon(Context, LTypesNames, false);
 
   // Create variable to hold this string table.
   GlobalVariable *GV = new GlobalVariable(*TheModule,