[vmkit-commits] [vmkit] r56841 - /vmkit/branches/isolate/lib/JnJVM/VMCore/JavaArray.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Sep 30 09:25:24 2008
New Revision: 56841

URL: http://llvm.org/viewvc/llvm-project?rev=56841&view=rev
Log:
Do not malloc but use GC-allocated memory to print an UTF8.


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

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

==============================================================================
--- vmkit/branches/isolate/lib/JnJVM/VMCore/JavaArray.cpp (original)
+++ vmkit/branches/isolate/lib/JnJVM/VMCore/JavaArray.cpp Tue Sep 30 09:25:24 2008
@@ -112,18 +112,12 @@
 }
 
 char* UTF8::UTF8ToAsciiz() const {
-  /*mvm::NativeString* buf = mvm::NativeString::alloc(size + 1);
+  mvm::NativeString* buf = mvm::NativeString::alloc(size + 1);
   for (sint32 i = 0; i < size; ++i) {
     buf->setAt(i, elements[i]);
   }
   buf->setAt(size, 0);
-  return buf->cString();*/
-  char* buf = (char*)malloc(size + 1);
-  for (sint32 i = 0; i < size; ++i) {
-    buf[i] =  elements[i];
-  }
-  buf[size] = 0;
-  return buf;
+  return buf->cString();
 }
 
 /// Currently, this uses malloc/free. This should use a custom memory pool.
@@ -135,6 +129,7 @@
   free(obj);
 }
 
+
 const UTF8* UTF8::acons(sint32 n, UserClassArray* cl,
                         JavaAllocator* allocator) {
   if (n < 0)