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

[Owen Anderson]

Author: resistor
Date: Mon Jul  6 13:44:04 2009
New Revision: 74845

URL: http://llvm.org/viewvc/llvm-project?rev=74845&view=rev
Log:
Update for constant folding API changes.

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Mon Jul  6 13:44:04 2009
@@ -466,7 +466,7 @@
   TheTarget = TME->CtorFn(*TheModule, FeatureStr);
   assert(TheTarget->getTargetData()->isBigEndian() == BYTES_BIG_ENDIAN);
 
-  TheFolder = new TargetFolder(TheTarget->getTargetData());
+  TheFolder = new TargetFolder(TheTarget->getTargetData(), &getGlobalContext());
 
   // Install information about target datalayout stuff into the module for
   // optimizer use.

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=74845&r1=74844&r2=74845&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Mon Jul  6 13:44:04 2009
@@ -33,6 +33,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/InlineAsm.h"
 #include "llvm/Instructions.h"
+#include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/Analysis/ConstantFolding.h"
 #include "llvm/System/Host.h"
@@ -7904,7 +7905,7 @@
     
     FieldPtr = ConstantFoldInstOperands(Instruction::GetElementPtr,
                                         FieldPtr->getType(), Ops,
-                                        3, &TD); 
+                                        3, &getGlobalContext(), &TD); 
     
     // Now that we did an offset from the start of the struct, subtract off
     // the offset from BitStart.