[vmkit-commits] [vmkit] r96259 - in /vmkit/trunk/lib/J3/Compiler: JavaJIT.cpp JavaJITOpcodes.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Feb 15 14:26:28 2010
New Revision: 96259

URL: http://llvm.org/viewvc/llvm-project?rev=96259&view=rev
Log:
Fix API change in LLVM.


Modified:
    vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=96259&r1=96258&r2=96259&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Mon Feb 15 14:26:28 2010
@@ -2003,7 +2003,7 @@
                            bool usign) {
   const Type* t2 = val->getType();
   if (t1 != t2) {
-    if (t1->isInteger() && t2->isInteger()) {
+    if (t1->isIntegerTy() && t2->isIntegerTy()) {
       if (t2->getPrimitiveSizeInBits() < t1->getPrimitiveSizeInBits()) {
         if (usign) {
           val = new ZExtInst(val, t1, "", currentBlock);
@@ -2013,7 +2013,7 @@
       } else {
         val = new TruncInst(val, t1, "", currentBlock);
       }    
-    } else if (t1->isFloatingPoint() && t2->isFloatingPoint()) {
+    } else if (t1->isFloatTy() && t2->isFloatTy()) {
       if (t2->getPrimitiveSizeInBits() < t1->getPrimitiveSizeInBits()) {
         val = new FPExtInst(val, t1, "", currentBlock);
       } else {

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=96259&r1=96258&r2=96259&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Mon Feb 15 14:26:28 2010
@@ -1876,7 +1876,7 @@
       }
       case IRETURN : {
         Value* val = pop();
-        assert(val->getType()->isInteger());
+        assert(val->getType()->isIntegerTy());
         convertValue(val, endNode->getType(), currentBlock, false);
         endNode->addIncoming(val, currentBlock);
         BranchInst::Create(endBlock, currentBlock);