Add two special runtime methods.
This is in preparation for being able to deoptimize upon returning
from a runtime method. We need to identify two special runtime methods:
clinit and suspend-check since if deoptimization happens when returning
from these two methods, we need to execute the dex instruction that
corresponds to the dex pc of the deoptimization point. A clinit can
be implicit for an invoke-static, in which case the invocation hasn't
happen yet so we have to execute the invoke-static in the interpreter.
For a suspend-check, the dex instruction for it hasn't been executed yet.
Test: full run-test/gtest on both host and target.
Bug: 33616143
Change-Id: Id1bdfcfa84a9ca27d5ee9da4b4a99467b1a4a845
diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h
index fad9278..50e9144 100644
--- a/runtime/art_method-inl.h
+++ b/runtime/art_method-inl.h
@@ -285,6 +285,10 @@
return "<runtime internal callee-save reference and argument registers method>";
} else if (this == runtime->GetCalleeSaveMethod(CalleeSaveType::kSaveEverything)) {
return "<runtime internal save-every-register method>";
+ } else if (this == runtime->GetCalleeSaveMethod(CalleeSaveType::kSaveEverythingForClinit)) {
+ return "<runtime internal save-every-register method for clinit>";
+ } else if (this == runtime->GetCalleeSaveMethod(CalleeSaveType::kSaveEverythingForSuspendCheck)) {
+ return "<runtime internal save-every-register method for suspend check>";
} else {
return "<unknown runtime internal method>";
}