[vmkit-commits] [vmkit] r166764 - in /vmkit/trunk/lib: j3/Compiler/JavaJIT.cpp j3/Compiler/LLVMInfo.cpp vmkit/Compiler/EscapeAnalysis.cpp vmkit/Compiler/JIT.cpp vmkit/StaticGCPrinter/VmkitGCPrinter.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Oct 26 04:17:07 2012
New Revision: 166764

URL: http://llvm.org/viewvc/llvm-project?rev=166764&view=rev
Log:
Update to new LLVM API.


Modified:
    vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
    vmkit/trunk/lib/vmkit/Compiler/EscapeAnalysis.cpp
    vmkit/trunk/lib/vmkit/Compiler/JIT.cpp
    vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp

Modified: vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp?rev=166764&r1=166763&r2=166764&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp Fri Oct 26 04:17:07 2012
@@ -1259,10 +1259,11 @@
       const UTF8* name =
         compilingClass->ctpInfo->UTF8At(AR.AnnotationNameIndex);
       if (name->equals(TheCompiler->InlinePragma)) {
-        llvmFunction->removeFnAttr(Attribute::NoInline);
-        llvmFunction->addFnAttr(Attribute::AlwaysInline);
+        llvmFunction->removeFnAttr(
+            Attributes::get(*llvmContext, Attributes::NoInline));
+        llvmFunction->addFnAttr(Attributes::AlwaysInline);
       } else if (name->equals(TheCompiler->NoInlinePragma)) {
-        llvmFunction->addFnAttr(Attribute::NoInline);
+        llvmFunction->addFnAttr(Attributes::NoInline);
       }
     }
   }

Modified: vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp?rev=166764&r1=166763&r2=166764&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp Fri Oct 26 04:17:07 2012
@@ -191,9 +191,9 @@
    
     result->setGC("vmkit");
     if (Compiler->useCooperativeGC()) { 
-      result->addFnAttr(Attribute::NoInline);
+      result->addFnAttr(Attributes::NoInline);
     }
-    result->addFnAttr(Attribute::NoUnwind);
+    result->addFnAttr(Attributes::NoUnwind);
     
     Compiler->functions.insert(std::make_pair(result, methodDef));
     if (!Compiler->isStaticCompiling() && !customizing && methodDef->code) {
@@ -468,8 +468,8 @@
   }
   
   res->setGC("vmkit");
-  res->addFnAttr(Attribute::NoInline);
-  res->addFnAttr(Attribute::NoUnwind);
+  res->addFnAttr(Attributes::NoInline);
+  res->addFnAttr(Attributes::NoUnwind);
 
   if (virt) {
     Compiler->virtualBufs[FTy] = res;
@@ -558,8 +558,8 @@
   }
   
   res->setGC("vmkit");
-  res->addFnAttr(Attribute::NoInline);
-  res->addFnAttr(Attribute::NoUnwind);
+  res->addFnAttr(Attributes::NoInline);
+  res->addFnAttr(Attributes::NoUnwind);
   
   if (virt) {
     Compiler->virtualAPs[FTy] = res;
@@ -676,8 +676,8 @@
   }
   
   stub->setGC("vmkit");
-  stub->addFnAttr(Attribute::NoInline);
-  stub->addFnAttr(Attribute::NoUnwind);
+  stub->addFnAttr(Attributes::NoInline);
+  stub->addFnAttr(Attributes::NoUnwind);
   
   if (virt) {
     Compiler->virtualStubs[FTy] = stub;

Modified: vmkit/trunk/lib/vmkit/Compiler/EscapeAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/EscapeAnalysis.cpp?rev=166764&r1=166763&r2=166764&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/EscapeAnalysis.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/EscapeAnalysis.cpp Fri Oct 26 04:17:07 2012
@@ -127,7 +127,7 @@
         CallSite::arg_iterator B = CS.arg_begin(), E = CS.arg_end();
         for (CallSite::arg_iterator A = B; A != E; ++A) {
           if (A->get() == Ins && 
-              !CS.paramHasAttr(A - B + 1, Attribute::NoCapture)) {
+              !CS.paramHasAttr(A - B + 1, Attributes::NoCapture)) {
             return true;
           }
         }

Modified: vmkit/trunk/lib/vmkit/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/JIT.cpp?rev=166764&r1=166763&r2=166764&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/JIT.cpp Fri Oct 26 04:17:07 2012
@@ -9,6 +9,7 @@
 
 #include <llvm/CallingConv.h>
 #include <llvm/Constants.h>
+#include <llvm/DebugInfo.h>
 #include <llvm/DerivedTypes.h>
 #include <llvm/Instructions.h>
 #include <llvm/LinkAllPasses.h>

Modified: vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp?rev=166764&r1=166763&r2=166764&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp (original)
+++ vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp Fri Oct 26 04:17:07 2012
@@ -289,7 +289,7 @@
 /// either condition is detected in a function which uses the GC.
 ///
 void VmkitAOTGCMetadataPrinter::finishAssembly(AsmPrinter &AP) {
-  unsigned IntPtrSize = AP.TM.getDataLayout()->getPointerSize();
+  unsigned IntPtrSize = AP.TM.getDataLayout()->getPointerSize(0);
 
   AP.OutStreamer.SwitchSection(AP.getObjFileLowering().getDataSection());