[vmkit-commits] [vmkit] r145901 - /vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp

[Will Dietz]

Author: wdietz2
Date: Mon Dec  5 20:24:23 2011
New Revision: 145901

URL: http://llvm.org/viewvc/llvm-project?rev=145901&view=rev
Log:
Add isAssignableFrom check when scanning bytecode for inline potential.

Brings behavior up to line with change made earlier in JavaJIT.

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

Modified: vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp?rev=145901&r1=145900&r2=145901&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp Mon Dec  5 20:24:23 2011
@@ -3339,6 +3339,7 @@
         bool customized = false;
         if (!(isFinal(cl->access) || isFinal(meth->access))) {
           if (customizeFor == NULL) return false;
+          if (!cl->isAssignableFrom(customizeFor)) return false;
           meth = customizeFor->lookupMethodDontThrow(
               meth->name, meth->type, false, true, NULL);
           assert(meth);