diff options
author | 2019-10-23 14:14:25 -0700 | |
---|---|---|
committer | 2019-10-28 23:46:26 +0000 | |
commit | c2d0c9627b969ba988c8817d1b765b1cb61a61f3 (patch) | |
tree | be3d4547d2a0a42d4085355383c509b0cb55f587 /runtime/mirror/class.cc | |
parent | 0c262edd22824f4465e0cb08879b7eea89d3fac0 (diff) |
Perform reverify with shared mutator-lock.
Despite comments that seemed to indicate otherwise the verifier is not
capable of running with a strong mutator-lock in all circumstances.
Specifically it relies on being able to allocate exceptions in a
number of situations (for example when a field could not be found but
the class could). This could lead to problems when trying to
reverify a class. To fix this we changed the reverify step to happen
outside of the strong mutator-lock and instead temporarily mark the
redefined methods with every verifier fail flag. The new verification
will then be performed and the flags reset (after suspending
everything).
This also fixes a related issue where performing the verification
with an exclusive mutator lock changed how elements in the dex-cache
were populated, causing the dex-cache to break invariants about
methods always having their classes be present. This could cause
crashes in some circumstances (for example test 1990).
Test: ./test.py --host
Test: go/lem
Bug: 142876078
This partially reverts commit b1eebde9469914ad634a6dc3746ddfb222595609
This partially reverts commit db55a1121b2437765e732c8bbedf914f8a52f624
Change-Id: I0f1e8c47118cc84c8f23c4068944069ac74f5ea3
Diffstat (limited to 'runtime/mirror/class.cc')
-rw-r--r-- | runtime/mirror/class.cc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc index a0e8a237c5..e1dd54f6f7 100644 --- a/runtime/mirror/class.cc +++ b/runtime/mirror/class.cc @@ -1040,6 +1040,24 @@ void Class::ClearSkipAccessChecksFlagOnAllMethods(PointerSize pointer_size) { } } +void Class::ClearMustCountLocksFlagOnAllMethods(PointerSize pointer_size) { + DCHECK(IsVerified()); + for (auto& m : GetMethods(pointer_size)) { + if (!m.IsNative() && m.IsInvokable()) { + m.ClearMustCountLocks(); + } + } +} + +void Class::ClearDontCompileFlagOnAllMethods(PointerSize pointer_size) { + DCHECK(IsVerified()); + for (auto& m : GetMethods(pointer_size)) { + if (!m.IsNative() && m.IsInvokable()) { + m.ClearDontCompile(); + } + } +} + void Class::SetSkipAccessChecksFlagOnAllMethods(PointerSize pointer_size) { DCHECK(IsVerified()); for (auto& m : GetMethods(pointer_size)) { |