commit ee155d4fe47fa751262beb43437a339fde8eabe5
author Ben Cheng <bccheng@google.com> Wed Nov 30 10:43:09 2011 -0800
committer Ben Cheng <bccheng@google.com> Wed Nov 30 13:28:58 2011 -0800
tree 9b99efed053f5374fd16909f64b054cb314e9622
parent cab0fdf82a668e2a1a054cd6506835046218e419

Initialize the JNI indirect ref table to make Valgrind happy.

Specifically, this is to eliminate the benign warning about the
'serial' field being uninitialized.

BUG: 5542417
Change-Id: I8550972e70db94f24c47c4e5dea0b59cc5840b48

vm/IndirectRefTable.cpp

diff --git a/vm/IndirectRefTable.cpp b/vm/IndirectRefTable.cpp
index e6d0a7e..c38458d 100644
--- a/vm/IndirectRefTable.cpp
+++ b/vm/IndirectRefTable.cpp
@@ -38,9 +38,7 @@
     if (table_ == NULL) {
         return false;
     }
-#ifndef NDEBUG
     memset(table_, 0xd1, initialCount * sizeof(IndirectRefSlot));
-#endif
 
     segmentState.all = IRT_FIRST_SEGMENT;
     alloc_entries_ = initialCount;
@@ -116,6 +114,9 @@
                 return NULL;
             }
 
+            memset(newTable + alloc_entries_, 0xd1,
+                   (newSize - alloc_entries_) * sizeof(IndirectRefSlot));
+
             alloc_entries_ = newSize;
             table_ = newTable;
         }