[vmkit-commits] [vmkit] r81134 - /vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Sep  6 16:37:31 2009
New Revision: 81134

URL: http://llvm.org/viewvc/llvm-project?rev=81134&view=rev
Log:
Add new llvm_gcroots.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp Sun Sep  6 16:37:31 2009
@@ -19,11 +19,16 @@
 
 JavaVirtualTable* JavaString::internStringVT = 0;
 
-JavaString* JavaString::stringDup(const ArrayUInt16*& array, Jnjvm* vm) {
+JavaString* JavaString::stringDup(const ArrayUInt16*& _array, Jnjvm* vm) {
+  
+  JavaString* res = 0;
+  const ArrayUInt16* array = 0;
   llvm_gcroot(array, 0);
+  llvm_gcroot(res, 0);
 
+  array = _array;
   UserClass* cl = vm->upcalls->newString;
-  JavaString* res = (JavaString*)cl->doNew(vm);
+  res = (JavaString*)cl->doNew(vm);
   
   // It's a hashed string, set the destructor so that the string
   // removes itself from the vm string map. Do this only if