commit 40381fb9dc4b4cf274f1e58b2cdf4396202c6189
author Brian Carlstrom <bdc@google.com> Wed Oct 19 14:13:40 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Oct 20 12:19:25 2011 -0700
tree 8281b105d3e8a0850984f0ee182db01c33613f27
parent b06631143b944388fc68bedf6679c006dde5f461

Reuse SIRT for C++ references

Change-Id: I8310e55da42f55f7ec60f6b17face436c77a979f

src/object.cc

diff --git a/src/object.cc b/src/object.cc
index b28594a..6ea1f59 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -30,23 +30,23 @@
   // Object::SizeOf gets the right size even if we're an array.
   // Using c->AllocObject() here would be wrong.
   size_t num_bytes = SizeOf();
-  Object* copy = Heap::AllocObject(c, num_bytes);
-  if (copy == NULL) {
+  SirtRef<Object> copy(Heap::AllocObject(c, num_bytes));
+  if (copy.get() == NULL) {
     return NULL;
   }
 
   // Copy instance data.  We assume memcpy copies by words.
   // TODO: expose and use move32.
   byte* src_bytes = reinterpret_cast<byte*>(this);
-  byte* dst_bytes = reinterpret_cast<byte*>(copy);
+  byte* dst_bytes = reinterpret_cast<byte*>(copy.get());
   size_t offset = sizeof(Object);
   memcpy(dst_bytes + offset, src_bytes + offset, num_bytes - offset);
 
   if (c->IsFinalizable()) {
-    Heap::AddFinalizerReference(copy);
+    Heap::AddFinalizerReference(copy.get());
   }
 
-  return copy;
+  return copy.get();
 }
 
 uint32_t Object::GetThinLockId() {
@@ -1329,14 +1329,15 @@
 }
 
 String* String::Alloc(Class* java_lang_String, int32_t utf16_length) {
-  CharArray* array = CharArray::Alloc(utf16_length);
-  if (array == NULL) {
+  SirtRef<CharArray> array(CharArray::Alloc(utf16_length));
+  if (array.get() == NULL) {
     return NULL;
   }
-  return Alloc(java_lang_String, array);
+  return Alloc(java_lang_String, array.get());
 }
 
 String* String::Alloc(Class* java_lang_String, CharArray* array) {
+  SirtRef<CharArray> array_ref(array);  // hold reference in case AllocObject causes GC
   String* string = down_cast<String*>(java_lang_String->AllocObject());
   if (string == NULL) {
     return NULL;