diff options
author | 2015-07-10 18:27:47 -0700 | |
---|---|---|
committer | 2015-07-17 17:38:46 -0700 | |
commit | 7617abdb402fd0419daa3eefb2ad059ccbb8b6db (patch) | |
tree | 85ca02f6446cd50523156ea916d5524eaf3bf2dc /runtime/class_linker.cc | |
parent | 479ebe076561e4a48129ab0c78cf8ca93c44baf6 (diff) |
runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS
Use ART_TEST_INTERPRETER_ACCESS_CHECKS=true to run all the tests through
the interpreter with access checks enabled. The normal interpreter tests
do not currently enable access checks, which means that a large part of
the interpreter codebase is untested.
The verifier will force every class into a soft fail mode if
-Xverify:softfail is used, thereby ensuring that if used along with the
interpreter (-Xint) that the interpret is always in access checks mode.
This is used alongside with --compile-filter=verify-at-runtime to
prevent the AOT compiler from putting down any code.
Change-Id: I35a10ed8c43d76fa96133cf01fdad497da387200
Diffstat (limited to 'runtime/class_linker.cc')
-rw-r--r-- | runtime/class_linker.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 5798c04ba8..8f7862a3b9 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -3040,6 +3040,18 @@ void ClassLinker::VerifyClass(Thread* self, Handle<mirror::Class> klass) { mirror::Class::SetStatus(klass, mirror::Class::kStatusVerifyingAtRuntime, self); } + // Skip verification if we are forcing a soft fail. + // This has to be before the normal verification enabled check, + // since technically verification is disabled in this mode. + if (UNLIKELY(Runtime::Current()->IsVerificationSoftFail())) { + // Force verification to be a 'soft failure'. + mirror::Class::SetStatus(klass, mirror::Class::kStatusVerified, self); + // As this is a fake verified status, make sure the methods are _not_ marked preverified + // later. + klass->SetPreverified(); + return; + } + // Skip verification if disabled. if (!Runtime::Current()->IsVerificationEnabled()) { mirror::Class::SetStatus(klass, mirror::Class::kStatusVerified, self); |