[vmkit-commits] [vmkit] r110612 - /vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Aug  9 17:14:31 2010
New Revision: 110612

URL: http://llvm.org/viewvc/llvm-project?rev=110612&view=rev
Log:
Move the threadAllocator so that it does not get deallocated too early. Patch by Allan Tong!


Modified:
    vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp

Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp?rev=110612&r1=110611&r2=110612&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp Mon Aug  9 17:14:31 2010
@@ -535,14 +535,13 @@
                                                        bool doResolve,
                                                        bool doThrow) {
   const UTF8* name = hashUTF8->lookupAsciiz(asciiz);
+  mvm::ThreadAllocator threadAllocator;
   if (!name) name = bootstrapLoader->hashUTF8->lookupAsciiz(asciiz);
   if (!name) {
-    mvm::ThreadAllocator threadAllocator;
     uint32 size = strlen(asciiz);
     UTF8* temp = (UTF8*)threadAllocator.Allocate(
         sizeof(UTF8) + size * sizeof(uint16));
     temp->size = size;
-    if (!temp) return 0;
 
     for (uint32 i = 0; i < size; ++i) {
       temp->elements[i] = asciiz[i];