diff options
Diffstat (limited to 'runtime/reflection.cc')
| -rw-r--r-- | runtime/reflection.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/runtime/reflection.cc b/runtime/reflection.cc index 5c394b136a..8ebbeddcb1 100644 --- a/runtime/reflection.cc +++ b/runtime/reflection.cc @@ -532,8 +532,8 @@ JValue InvokeWithVarArgs(const ScopedObjectAccessAlreadyRunnable& soa, // We want to make sure that the stack is not within a small distance from the // protected region in case we are calling into a leaf function whose stack // check has been elided. - if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEnd())) { - ThrowStackOverflowError(soa.Self()); + if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEnd<kNativeStackType>())) { + ThrowStackOverflowError<kNativeStackType>(soa.Self()); return JValue(); } bool is_string_init = method->IsStringConstructor(); @@ -574,8 +574,8 @@ JValue InvokeWithJValues(const ScopedObjectAccessAlreadyRunnable& soa, // We want to make sure that the stack is not within a small distance from the // protected region in case we are calling into a leaf function whose stack // check has been elided. - if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEnd())) { - ThrowStackOverflowError(soa.Self()); + if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEnd<kNativeStackType>())) { + ThrowStackOverflowError<kNativeStackType>(soa.Self()); return JValue(); } bool is_string_init = method->IsStringConstructor(); @@ -615,8 +615,8 @@ JValue InvokeVirtualOrInterfaceWithJValues(const ScopedObjectAccessAlreadyRunnab // We want to make sure that the stack is not within a small distance from the // protected region in case we are calling into a leaf function whose stack // check has been elided. - if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEnd())) { - ThrowStackOverflowError(soa.Self()); + if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEnd<kNativeStackType>())) { + ThrowStackOverflowError<kNativeStackType>(soa.Self()); return JValue(); } ObjPtr<mirror::Object> receiver = soa.Decode<mirror::Object>(obj); @@ -658,8 +658,8 @@ JValue InvokeVirtualOrInterfaceWithVarArgs(const ScopedObjectAccessAlreadyRunnab // We want to make sure that the stack is not within a small distance from the // protected region in case we are calling into a leaf function whose stack // check has been elided. - if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEnd())) { - ThrowStackOverflowError(soa.Self()); + if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEnd<kNativeStackType>())) { + ThrowStackOverflowError<kNativeStackType>(soa.Self()); return JValue(); } @@ -702,7 +702,7 @@ jobject InvokeMethod(const ScopedObjectAccessAlreadyRunnable& soa, jobject javaM // check has been elided. if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEndForInterpreter(true))) { - ThrowStackOverflowError(soa.Self()); + ThrowStackOverflowError<kNativeStackType>(soa.Self()); return nullptr; } @@ -797,7 +797,7 @@ void InvokeConstructor(const ScopedObjectAccessAlreadyRunnable& soa, // protected region in case we are calling into a leaf function whose stack // check has been elided. if (UNLIKELY(__builtin_frame_address(0) < soa.Self()->GetStackEndForInterpreter(true))) { - ThrowStackOverflowError(soa.Self()); + ThrowStackOverflowError<kNativeStackType>(soa.Self()); return; } |