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

Nicolas Geoffray nicolas.geoffray at lip6.fr
Wed Sep 16 07:18:38 PDT 2009


Author: geoffray
Date: Wed Sep 16 09:18:37 2009
New Revision: 82048

URL: http://llvm.org/viewvc/llvm-project?rev=82048&view=rev
Log:
Add a forgotten llvm_gcroot.


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=82048&r1=82047&r2=82048&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp Wed Sep 16 09:18:37 2009
@@ -55,12 +55,13 @@
 
 const ArrayUInt16* JavaString::strToArray(Jnjvm* vm) {
   JavaString* self = this;
+  ArrayUInt16* array = 0;
   llvm_gcroot(self, 0);
+  llvm_gcroot(array, 0);
 
   assert(self->value && "String without an array?");
   if (self->offset || (self->count != self->value->size)) {
-    ArrayUInt16* array = 
-      (ArrayUInt16*)vm->upcalls->ArrayOfChar->doNew(self->count, vm);
+    array = (ArrayUInt16*)vm->upcalls->ArrayOfChar->doNew(self->count, vm);
     uint16* buf = array->elements;
 
     for (sint32 i = 0; i < count; i++) {





More information about the vmkit-commits mailing list