Ensure R4 is initialized for upcall. Sort suspend naming.
Change-Id: I73eb49e1af2ced971eeaafb7c07f5d964dae1824
diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index db6cbf0..c7a04ec 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -685,11 +685,13 @@
DCHECK(!thread->IsExceptionPending());
}
-extern "C" void artCheckSuspendFromJni(Thread* thread) {
+void CheckSuspendFromCode(Thread* thread) {
+ // Called when thread->suspend_count_ != 0
Runtime::Current()->GetThreadList()->FullSuspendCheck(thread);
}
-extern "C" void artCheckSuspendFromCode(Thread* thread, Method** sp) {
+extern "C" void artTestSuspendFromCode(Thread* thread, Method** sp) {
+ // Called when suspend count check value is 0 and thread->suspend_count_ != 0
FinishCalleeSaveFrameSetup(thread, sp, Runtime::kRefsOnly);
Runtime::Current()->GetThreadList()->FullSuspendCheck(thread);
}