summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author Carl Shapiro <cshapiro@google.com> 2011-08-18 14:58:25 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-08-18 14:58:25 -0700
commit1c332df048f796ad0656644cb0433bd6e7a49aa3 (patch)
tree3dc2cabad9919290c89aa14f32ac65b5361a8baa /src
parentc5f7c91ab89055cffb573fff7e06dbdd860bcced (diff)
parent84d00e6caa8302abafca8907a2404eadc920f6a8 (diff)
Merge "Fix a typo that breaks the arugment size computation." into dalvik-dev
Diffstat (limited to 'src')
-rw-r--r--src/object.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/object.cc b/src/object.cc
index 21f3537444..8af17787b3 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -296,7 +296,7 @@ size_t Method::NumArgArrayBytes() {
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*);