diff options
| author | 2019-08-07 10:15:39 +0100 | |
|---|---|---|
| committer | 2019-08-07 14:11:21 +0000 | |
| commit | 635967b5d16e25630276c23aa47daf52ec493ea1 (patch) | |
| tree | 4f9cba20e58ae2997b4d693d4e1e76ccd684637f /runtime/interpreter/interpreter_switch_impl-inl.h | |
| parent | 8d5a215a7e879d8aa9c7d9d2791ed107ecc41f59 (diff) | |
Remove message ART creates for "throw null".
The new version of R8 transforms:
throw new NullPointerException()
Into:
throw null
ART used to create a message for the pattern "throw null", which is
something that now breaks ObjectsTest.requireNonNull.
Test: libcore.java.util.ObjectsTest#test_requireNonNull_T
Change-Id: I142ddc74a9c0cfc76d2479eb92078b7a7d077b27
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl-inl.h')
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl-inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl-inl.h b/runtime/interpreter/interpreter_switch_impl-inl.h index 2ee0512fe3..be4b807267 100644 --- a/runtime/interpreter/interpreter_switch_impl-inl.h +++ b/runtime/interpreter/interpreter_switch_impl-inl.h @@ -799,7 +799,7 @@ class InstructionHandler { } ObjPtr<mirror::Object> exception = GetVRegReference(A()); if (UNLIKELY(exception == nullptr)) { - ThrowNullPointerException("throw with null exception"); + ThrowNullPointerException(); } else if (do_assignability_check && !exception->GetClass()->IsThrowableClass()) { // This should never happen. std::string temp; |