OSDN Git Service

Increase vtable size for String class
authorYi Kong <yikong@google.com>
Tue, 12 Apr 2016 21:38:06 +0000 (22:38 +0100)
committerYi Kong <yikong@google.com>
Mon, 18 Apr 2016 10:32:05 +0000 (11:32 +0100)
Tracks libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af which
increases vtable size for String by four.

Bug: 28108421
Change-Id: I3f7b373ffc08a0f5351f04b5045866ea040f8e6e
(cherry picked from commit 478078a8f9375ec53a3c77c19c0cdb82a9917c88)

runtime/mirror/string-inl.h

index 0e7f7f3..6285542 100644 (file)
@@ -33,7 +33,7 @@ namespace art {
 namespace mirror {
 
 inline uint32_t String::ClassSize(size_t pointer_size) {
-  uint32_t vtable_entries = Object::kVTableLength + 52;
+  uint32_t vtable_entries = Object::kVTableLength + 56;
   return Class::ComputeClassSize(true, vtable_entries, 0, 0, 0, 1, 2, pointer_size);
 }