[vmkit-commits] [vmkit] r56304 - /vmkit/branches/isolate/lib/JnJVM/VMCore/JnjvmModule.cpp

Nicolas Geoffray nicolas.geoffray at lip6.fr
Thu Sep 18 06:08:33 PDT 2008


Author: geoffray
Date: Thu Sep 18 08:08:32 2008
New Revision: 56304

URL: http://llvm.org/viewvc/llvm-project?rev=56304&view=rev
Log:
Disable finalization in a isolate environment.


Modified:
    vmkit/branches/isolate/lib/JnJVM/VMCore/JnjvmModule.cpp

Modified: vmkit/branches/isolate/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/isolate/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=56304&r1=56303&r2=56304&view=diff

==============================================================================
--- vmkit/branches/isolate/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/branches/isolate/lib/JnJVM/VMCore/JnjvmModule.cpp Thu Sep 18 08:08:32 2008
@@ -215,6 +215,7 @@
     VirtualTable* VT = 0;
     if (meth->name->equals(Jnjvm::finalize)) {
       VT = allocateVT(cl, ++meths);
+#ifndef MULTIPLE_VM
       meth->offset = 0;
       Function* func = cl->classLoader->TheModuleProvider->parseFunction(meth);
       if (!cl->super) meth->canBeInlined = true;
@@ -227,6 +228,7 @@
         // LLVM does not allow recursive compilation. Create the code now.
         ((void**)VT)[0] = EE->getPointerToFunction(func);
       }
+#endif
     } else {
     
       Class* methodCl = 0;





More information about the vmkit-commits mailing list