[vmkit-commits] [vmkit] r170965 - in /vmkit/trunk/lib: j3/Compiler/JavaJIT.cpp j3/Compiler/LLVMInfo.cpp vmkit/Compiler/EscapeAnalysis.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Dec 21 18:07:58 2012
New Revision: 170965

URL: http://llvm.org/viewvc/llvm-project?rev=170965&view=rev
Log:
Move 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

Modified: vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp?rev=170965&r1=170964&r2=170965&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp Fri Dec 21 18:07:58 2012
@@ -1260,10 +1260,10 @@
         compilingClass->ctpInfo->UTF8At(AR.AnnotationNameIndex);
       if (name->equals(TheCompiler->InlinePragma)) {
         llvmFunction->removeFnAttr(
-            Attributes::get(*llvmContext, Attributes::NoInline));
-        llvmFunction->addFnAttr(Attributes::AlwaysInline);
+            Attribute::get(*llvmContext, Attribute::NoInline));
+        llvmFunction->addFnAttr(Attribute::AlwaysInline);
       } else if (name->equals(TheCompiler->NoInlinePragma)) {
-        llvmFunction->addFnAttr(Attributes::NoInline);
+        llvmFunction->addFnAttr(Attribute::NoInline);
       }
     }
   }

Modified: vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp?rev=170965&r1=170964&r2=170965&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp Fri Dec 21 18:07:58 2012
@@ -191,9 +191,9 @@
    
     result->setGC("vmkit");
     if (Compiler->useCooperativeGC()) { 
-      result->addFnAttr(Attributes::NoInline);
+      result->addFnAttr(Attribute::NoInline);
     }
-    result->addFnAttr(Attributes::NoUnwind);
+    result->addFnAttr(Attribute::NoUnwind);
     
     Compiler->functions.insert(std::make_pair(result, methodDef));
     if (!Compiler->isStaticCompiling() && !customizing && methodDef->code) {
@@ -457,8 +457,8 @@
   }
   
   res->setGC("vmkit");
-  res->addFnAttr(Attributes::NoInline);
-  res->addFnAttr(Attributes::NoUnwind);
+  res->addFnAttr(Attribute::NoInline);
+  res->addFnAttr(Attribute::NoUnwind);
 
   if (virt) {
     Compiler->virtualBufs[FTy] = res;
@@ -547,8 +547,8 @@
   }
   
   res->setGC("vmkit");
-  res->addFnAttr(Attributes::NoInline);
-  res->addFnAttr(Attributes::NoUnwind);
+  res->addFnAttr(Attribute::NoInline);
+  res->addFnAttr(Attribute::NoUnwind);
   
   if (virt) {
     Compiler->virtualAPs[FTy] = res;
@@ -665,8 +665,8 @@
   }
   
   stub->setGC("vmkit");
-  stub->addFnAttr(Attributes::NoInline);
-  stub->addFnAttr(Attributes::NoUnwind);
+  stub->addFnAttr(Attribute::NoInline);
+  stub->addFnAttr(Attribute::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=170965&r1=170964&r2=170965&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/EscapeAnalysis.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/EscapeAnalysis.cpp Fri Dec 21 18:07:58 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, Attributes::NoCapture)) {
+              !CS.paramHasAttr(A - B + 1, Attribute::NoCapture)) {
             return true;
           }
         }