From 6cc23acba91d26d7afd6bc681004ac5865a8a163 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 24 Aug 2018 15:22:43 -0700 Subject: ART: Add API level to verifier Pass API level to verifier. In preparation for API-level dependent checks. Bug: 111969862 Test: m test-art-host Change-Id: I700ef52e28436a7fda8b9d9ef29841110ed6d3bb --- compiler/driver/compiler_driver.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 6eca304223..3f28aa7c68 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1886,7 +1886,9 @@ void CompilerDriver::Verify(jobject jclass_loader, class VerifyClassVisitor : public CompilationVisitor { public: VerifyClassVisitor(const ParallelCompilationManager* manager, verifier::HardFailLogMode log_level) - : manager_(manager), log_level_(log_level) {} + : manager_(manager), + log_level_(log_level), + sdk_version_(Runtime::Current()->GetTargetSdkVersion()) {} virtual void Visit(size_t class_def_index) REQUIRES(!Locks::mutator_lock_) OVERRIDE { ScopedTrace trace(__FUNCTION__); @@ -1923,6 +1925,7 @@ class VerifyClassVisitor : public CompilationVisitor { Runtime::Current()->GetCompilerCallbacks(), true /* allow soft failures */, log_level_, + sdk_version_, &error_msg); if (failure_kind == verifier::FailureKind::kHardFailure) { LOG(ERROR) << "Verification failed on class " << PrettyDescriptor(descriptor) @@ -1995,6 +1998,7 @@ class VerifyClassVisitor : public CompilationVisitor { private: const ParallelCompilationManager* const manager_; const verifier::HardFailLogMode log_level_; + const uint32_t sdk_version_; }; void CompilerDriver::VerifyDexFile(jobject class_loader, -- cgit v1.2.3-59-g8ed1b