Merge "Tune ArenaBitVector::Iterator::Next." into dalvik-dev
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),)
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);
}
}