[vmkit-commits] [vmkit] r89746 - in /vmkit/trunk/lib/JnJVM: Compiler/JnjvmModule.cpp VMCore/JavaClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Nov 24 01:43:45 2009
New Revision: 89746

URL: http://llvm.org/viewvc/llvm-project?rev=89746&view=rev
Log:
Don't test if it's a stub if ip is null.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp

Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=89746&r1=89745&r2=89746&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Tue Nov 24 01:43:45 2009
@@ -415,7 +415,8 @@
 }
 
 void JavaJITMethodInfo::print(void* ip, void* addr) {
-  void* new_ip = isStub(ip, addr);
+  void* new_ip = NULL;
+  if (ip) new_ip = isStub(ip, addr);
   fprintf(stderr, "; %p in %s.%s", new_ip,
           UTF8Buffer(meth->classDef->name).cString(),
           UTF8Buffer(meth->name).cString());

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=89746&r1=89745&r2=89746&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Tue Nov 24 01:43:45 2009
@@ -321,7 +321,8 @@
 }
 
 void JavaStaticMethodInfo::print(void* ip, void* addr) {
-  void* new_ip = mvm::MethodInfo::isStub(ip, addr);
+  void* new_ip = NULL;
+  new_ip = mvm::MethodInfo::isStub(ip, addr);
   fprintf(stderr, "; %p in %s.%s", new_ip,
           UTF8Buffer(meth->classDef->name).cString(),
           UTF8Buffer(meth->name).cString());