diff options
| author | 2015-11-12 11:49:06 +0000 | |
|---|---|---|
| committer | 2015-11-12 11:52:42 +0000 | |
| commit | d1ef4362bf799f9f5d50e5edef8433664b503051 (patch) | |
| tree | 59aaa140925efa790f787d5e1caf6d0cafd6ae15 /runtime/mirror/string-inl.h | |
| parent | e4cf5892c2a244034900d49499c071b255571bba (diff) | |
| parent | f32e8327da5dd33abe18662fbca5e584cd047816 (diff) | |
Merge lmp changes into mnc.
Most merge conflicts are due to changes in the string representation.
They have been resolved in favour of "mnc-dev" since we've changed
the string representation there. Other changes relate to the
fact that there are now two jars in libcore (core-oj and core-libart).
Change-Id: I1fcc6e5f8dab8d1954dcddca0493563e7677d433
Diffstat (limited to 'runtime/mirror/string-inl.h')
| -rw-r--r-- | runtime/mirror/string-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/string-inl.h b/runtime/mirror/string-inl.h index d283f58866..e17e379474 100644 --- a/runtime/mirror/string-inl.h +++ b/runtime/mirror/string-inl.h @@ -31,8 +31,8 @@ namespace art { namespace mirror { inline uint32_t String::ClassSize(size_t pointer_size) { - uint32_t vtable_entries = Object::kVTableLength + 52; - return Class::ComputeClassSize(true, vtable_entries, 0, 1, 0, 1, 2, pointer_size); + uint32_t vtable_entries = Object::kVTableLength + 53; + return Class::ComputeClassSize(true, vtable_entries, 0, 2, 0, 1, 2, pointer_size); } // Sets string count in the allocation code path to ensure it is guarded by a CAS. |