commit | 2cfd15d1940c848fd60b454c545a33e2a78d185e | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Aug 18 15:58:49 2011 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 18 15:58:49 2011 -0700 |
tree | 7bb234b295ff13a8554db38f6acabc06d40c65ca | |
parent | 1c332df048f796ad0656644cb0433bd6e7a49aa3 [diff] | |
parent | 18c0753c1659629021b4becdaa3f6ea81aecce35 [diff] |
Merge "Initialize the rest of libcore's native code." into dalvik-dev
diff --git a/src/object.cc b/src/object.cc index 21f3537..8af1778 100644 --- a/src/object.cc +++ b/src/object.cc
@@ -296,7 +296,7 @@ char ch = shorty[i]; if (ch == 'D' || ch == 'J') { num_bytes += 8; - } if (ch == 'L') { + } else if (ch == 'L') { // Argument is a reference or an array. The shorty descriptor // does not distinguish between these types. num_bytes += sizeof(Object*);