commit | 1c332df048f796ad0656644cb0433bd6e7a49aa3 | [log] [tgz] |
---|---|---|
author | Carl Shapiro <cshapiro@google.com> | Thu Aug 18 14:58:25 2011 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 18 14:58:25 2011 -0700 |
tree | 3dc2cabad9919290c89aa14f32ac65b5361a8baa | |
parent | c5f7c91ab89055cffb573fff7e06dbdd860bcced [diff] | |
parent | 84d00e6caa8302abafca8907a2404eadc920f6a8 [diff] |
Merge "Fix a typo that breaks the arugment size computation." 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*);