commit 4b3dc167917f8cf700416659b1bca220c1ccafe9
author Ian Rogers <irogers@google.com> Tue Jun 04 01:00:56 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 04 01:00:57 2013 +0000
tree 58397e15a0a9ed69aba33755cca314c02a848e32
parent 8d44885106503f68e5b977c080df8ae6cc360497
parent 48ae54e62578d9382488c62d6779e95cd8302291

Merge "Tune ArenaBitVector::Iterator::Next." into dalvik-dev

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index e06c8cd..43f7ff5 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -19,6 +19,9 @@
 $(info Enabling ART_SMALL_MODE because of existence of art/SMALL_ART)
 ART_SMALL_MODE := true
 endif
+ifeq ($(WITH_ART_SMALL_MODE), true)
+ART_SMALL_MODE := true
+endif
 
 ART_USE_PORTABLE_COMPILER := false
 ifneq ($(wildcard art/USE_PORTABLE_COMPILER),)

src/stack.cc

diff --git a/src/stack.cc b/src/stack.cc
index c32b822..8672975 100644
--- a/src/stack.cc
+++ b/src/stack.cc
@@ -47,7 +47,7 @@
   if (m->IsStatic()) {
     return NULL;
   } else {
-    return GetVRegReference(number_of_vregs_ - num_ins);
+    return GetVRegReference(NumberOfVRegs() - num_ins);
   }
 }