[vmkit-commits] [vmkit] r145473 - /vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp

[Will Dietz]

Author: wdietz2
Date: Tue Nov 29 21:52:31 2011
New Revision: 145473

URL: http://llvm.org/viewvc/llvm-project?rev=145473&view=rev
Log:
JavaJIT: Don't set canBeDirect if no method.

Modified:
    vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp

Modified: vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp?rev=145473&r1=145472&r2=145473&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp Tue Nov 29 21:52:31 2011
@@ -152,8 +152,8 @@
     }
   }
  
-  if ((cl && isFinal(cl->access)) || 
-      (meth && (isFinal(meth->access) || isPrivate(meth->access)))) {
+  if (meth && ((cl && isFinal(cl->access)) ||
+      isFinal(meth->access) || isPrivate(meth->access))) {
     canBeDirect = true;
   }
 
@@ -183,6 +183,7 @@
                                            true, 0);
     }
   }
+  assert((meth || !canBeDirect) && "Can't directly call a method we don't have");
  
   Typedef* retTypedef = signature->getReturnType();
   std::vector<Value*> args; // size = [signature->nbIn + 3];