diff options
| author | 2019-12-03 08:47:26 +0000 | |
|---|---|---|
| committer | 2019-12-03 08:47:45 +0000 | |
| commit | 664999a12d6fc8a8ef5c0519b12ec1e8a51bb085 (patch) | |
| tree | f4ae1b0844ac075807229db9695ead7dec07ff8a /runtime/entrypoints/entrypoint_utils-inl.h | |
| parent | 642af13b1b14794d8ab0db5cc82206213e648fa1 (diff) | |
Revert "Revert^2 "Allow structural redefinition on non-final classes.""
This reverts commit f1b809ce611e943f926fff97cefe0930226ffcc2.
Reason for revert: Tests still fail
Bug: 134162467
Bug: 144168550
Change-Id: Icdebc826b8630920b716afbfd6f338a29669fcc2
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils-inl.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils-inl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index c67b1b0791..cc1a7f88e5 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -358,8 +358,7 @@ inline ArtField* FindFieldFromCode(uint32_t field_idx, DCHECK(self->IsExceptionPending()); // Throw exception and unwind. return nullptr; // Failure. } - if (UNLIKELY(is_set && resolved_field->IsFinal() && (fields_class != referring_class) && - !referring_class->IsObsoleteVersionOf(fields_class))) { + if (UNLIKELY(is_set && resolved_field->IsFinal() && (fields_class != referring_class))) { ThrowIllegalAccessErrorFinalField(referrer, resolved_field); return nullptr; // Failure. } else { |