Merge "Follow up on CL 123650"
diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc
index 14834dd..e336c38 100644
--- a/runtime/instrumentation.cc
+++ b/runtime/instrumentation.cc
@@ -56,7 +56,8 @@
static bool InstallStubsClassVisitor(mirror::Class* klass, void* arg)
EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_) {
Instrumentation* instrumentation = reinterpret_cast<Instrumentation*>(arg);
- return instrumentation->InstallStubsForClass(klass);
+ instrumentation->InstallStubsForClass(klass);
+ return true; // we visit all classes.
}
Instrumentation::Instrumentation()
@@ -73,7 +74,7 @@
quick_alloc_entry_points_instrumentation_counter_(0) {
}
-bool Instrumentation::InstallStubsForClass(mirror::Class* klass) {
+void Instrumentation::InstallStubsForClass(mirror::Class* klass) {
if (klass->IsErroneous()) {
// We can't execute code in a erroneous class: do nothing.
} else if (!klass->IsResolved()) {
@@ -87,7 +88,6 @@
InstallStubsForMethod(klass->GetVirtualMethod(i));
}
}
- return true;
}
static void UpdateEntrypoints(mirror::ArtMethod* method, const void* quick_code)
diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h
index 2af9a73..cea0388 100644
--- a/runtime/instrumentation.h
+++ b/runtime/instrumentation.h
@@ -328,7 +328,7 @@
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
// Call back for configure stubs.
- bool InstallStubsForClass(mirror::Class* klass) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ void InstallStubsForClass(mirror::Class* klass) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
void InstallStubsForMethod(mirror::ArtMethod* method)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);