[vmkit-commits] [vmkit] r170957 - in /vmkit/branches/release_032: ./ lib/j3/Compiler/JavaLLVMCompiler.cpp lib/j3/Compiler/LLVMInfo.cpp lib/j3/VMCore/JavaThread.h lib/j3/VMCore/Jni.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Dec 21 17:23:48 2012
New Revision: 170957

URL: http://llvm.org/viewvc/llvm-project?rev=170957&view=rev
Log:
Merge with trunk.


Modified:
    vmkit/branches/release_032/   (props changed)
    vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp
    vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp
    vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h
    vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp

Propchange: vmkit/branches/release_032/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 21 17:23:48 2012
@@ -1,2 +1,3 @@
 /vmkit/branches/precise:112509-120199
 /vmkit/branches/release_028:115466-116298
+/vmkit/trunk:167712-170949

Modified: vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp?rev=170957&r1=170956&r2=170957&view=diff
==============================================================================
--- vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp (original)
+++ vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp Fri Dec 21 17:23:48 2012
@@ -61,7 +61,7 @@
   // We are jitting. Take the lock.
   vmkit::VmkitModule::protectIR();
   if (func->getLinkage() == GlobalValue::ExternalWeakLinkage) {
-    JavaJIT jit(this, meth, func, customizeFor);
+    JavaJIT jit(this, meth, func, LMI->isCustomizable? customizeFor : NULL);
     if (isNative(meth->access)) {
       jit.nativeCompile();
       vmkit::VmkitModule::runPasses(func, JavaNativeFunctionPasses);
@@ -75,11 +75,9 @@
     if (!LMI->isCustomizable && jit.isCustomizable) {
       // It's the first time we parsed the method and we just found
       // out it can be customized.
+      // TODO(geoffray): return a customized version to this caller.
       meth->isCustomizable = true;
       LMI->isCustomizable = true;
-      if (customizeFor != NULL) {
-        LMI->setCustomizedVersion(customizeFor, func);
-      }
     }
   }
   vmkit::VmkitModule::unprotectIR();

Modified: vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp?rev=170957&r1=170956&r2=170957&view=diff
==============================================================================
--- vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp Fri Dec 21 17:23:48 2012
@@ -209,17 +209,6 @@
   return result;
 }
 
-void LLVMMethodInfo::setCustomizedVersion(Class* cl, llvm::Function* F) {
-  assert(customizedVersions.size() == 0);
-  vmkit::ThreadAllocator allocator;
-  if (Compiler->emitFunctionName()) {
-    char* buf = GetMethodName(allocator, methodDef, cl);
-    F->setName(buf);
-  }
-  methodFunction = NULL;
-  customizedVersions[cl] = F;
-}
-
 FunctionType* LLVMMethodInfo::getFunctionType() {
   if (!functionType) {
     Signdef* sign = methodDef->getSignature();

Modified: vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h?rev=170957&r1=170956&r2=170957&view=diff
==============================================================================
--- vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h (original)
+++ vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h Fri Dec 21 17:23:48 2012
@@ -156,8 +156,7 @@
   /// throwFromJNI - Throw an exception after executing JNI code.
   ///
   void throwFromJNI(word_t SP) {
-    endKnownFrame();
-    enterUncooperativeCode(SP);
+    // Nothing to do. The RETURN_FROM_JNI will take care of it.
   }
   
   /// throwFromNative - Throw an exception after executing Native code.

Modified: vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp?rev=170957&r1=170956&r2=170957&view=diff
==============================================================================
--- vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp (original)
+++ vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp Fri Dec 21 17:23:48 2012
@@ -459,7 +459,7 @@
 
   END_JNI_EXCEPTION
 
-  return JNI_FALSE;
+  RETURN_FROM_JNI(0);
 }