Add read barriers for the roots in Runtime.
Bug: 12687968
Change-Id: If26518a8251702cfe4d5cd7d1f50e80e342704cf
diff --git a/runtime/runtime-inl.h b/runtime/runtime-inl.h
index 29ddd1d..d08e658 100644
--- a/runtime/runtime-inl.h
+++ b/runtime/runtime-inl.h
@@ -21,18 +21,18 @@
namespace art {
-inline QuickMethodFrameInfo Runtime::GetRuntimeMethodFrameInfo(mirror::ArtMethod* method) const {
+inline QuickMethodFrameInfo Runtime::GetRuntimeMethodFrameInfo(mirror::ArtMethod* method) {
DCHECK(method != nullptr);
// Cannot be imt-conflict-method or resolution-method.
DCHECK(method != GetImtConflictMethod());
DCHECK(method != GetResolutionMethod());
// Don't use GetCalleeSaveMethod(), some tests don't set all callee save methods.
- if (method == callee_save_methods_[Runtime::kRefsAndArgs]) {
+ if (method == GetCalleeSaveMethodUnchecked(Runtime::kRefsAndArgs)) {
return GetCalleeSaveMethodFrameInfo(Runtime::kRefsAndArgs);
- } else if (method == callee_save_methods_[Runtime::kSaveAll]) {
+ } else if (method == GetCalleeSaveMethodUnchecked(Runtime::kSaveAll)) {
return GetCalleeSaveMethodFrameInfo(Runtime::kSaveAll);
} else {
- DCHECK(method == callee_save_methods_[Runtime::kRefsOnly]);
+ DCHECK(method == GetCalleeSaveMethodUnchecked(Runtime::kRefsOnly));
return GetCalleeSaveMethodFrameInfo(Runtime::kRefsOnly);
}
}