diff options
| author | 2021-07-05 17:43:35 +0100 | |
|---|---|---|
| committer | 2021-07-07 07:13:01 +0000 | |
| commit | 4dc6589f392d46800a3b64625245bdfe4bbbfc2f (patch) | |
| tree | b159262fd300a650ab89277667641ebe7e13d357 /runtime/class_linker_test.cc | |
| parent | e0386f10d4591afa9823658099e4f2ac7a693255 (diff) | |
Don't wrap VerifyError into NoClassDefFoundError.
Follow RI behavior by returning the VerifyError. NoClassDefFoundError
only wraps initializer errors.
Also rename the field in ClassExt from verifyError to
erroneousStateError for better clarity.
And remove now unused feature of storing a class in the verifyError
field.
Test: test.py
Test: 824-verification-rethrow
Bug: 28313047
Change-Id: I19383f7b74f22a62ab1e0b8a13bea75a14c7b33f
Diffstat (limited to 'runtime/class_linker_test.cc')
| -rw-r--r-- | runtime/class_linker_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 691fcf1293..d1f3a17792 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -613,6 +613,7 @@ struct ClassOffsets : public CheckOffsets<mirror::Class> { struct ClassExtOffsets : public CheckOffsets<mirror::ClassExt> { ClassExtOffsets() : CheckOffsets<mirror::ClassExt>(false, "Ldalvik/system/ClassExt;") { + addOffset(OFFSETOF_MEMBER(mirror::ClassExt, erroneous_state_error_), "erroneousStateError"); addOffset(OFFSETOF_MEMBER(mirror::ClassExt, instance_jfield_ids_), "instanceJfieldIDs"); addOffset(OFFSETOF_MEMBER(mirror::ClassExt, jmethod_ids_), "jmethodIDs"); addOffset(OFFSETOF_MEMBER(mirror::ClassExt, obsolete_class_), "obsoleteClass"); @@ -624,7 +625,6 @@ struct ClassExtOffsets : public CheckOffsets<mirror::ClassExt> { addOffset(OFFSETOF_MEMBER(mirror::ClassExt, pre_redefine_dex_file_ptr_), "preRedefineDexFilePtr"); addOffset(OFFSETOF_MEMBER(mirror::ClassExt, static_jfield_ids_), "staticJfieldIDs"); - addOffset(OFFSETOF_MEMBER(mirror::ClassExt, verify_error_), "verifyError"); } }; |