From 69dfe51b684dd9d510dbcb63295fe180f998efde Mon Sep 17 00:00:00 2001 From: Dave Allison Date: Fri, 11 Jul 2014 17:11:58 +0000 Subject: Revert "Revert "Revert "Revert "Add implicit null and stack checks for x86"""" This reverts commit 0025a86411145eb7cd4971f9234fc21c7b4aced1. Bug: 16256184 Change-Id: Ie0760a0c293aa3b62e2885398a8c512b7a946a73 --- compiler/image_test.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'compiler/image_test.cc') diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 982e6d4f2c..fe4fcd4177 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -25,7 +25,6 @@ #include "elf_fixup.h" #include "gc/space/image_space.h" #include "image_writer.h" -#include "implicit_check_options.h" #include "lock_word.h" #include "mirror/object-inl.h" #include "oat_writer.h" @@ -81,8 +80,6 @@ TEST_F(ImageTest, WriteRead) { t.NewTiming("WriteElf"); ScopedObjectAccess soa(Thread::Current()); SafeMap key_value_store; - key_value_store.Put(ImplicitCheckOptions::kImplicitChecksOatHeaderKey, - ImplicitCheckOptions::Serialize(true, true, true)); OatWriter oat_writer(class_linker->GetBootClassPath(), 0, 0, compiler_driver_.get(), &timings, &key_value_store); bool success = compiler_driver_->WriteElf(GetTestAndroidRoot(), @@ -144,9 +141,6 @@ TEST_F(ImageTest, WriteRead) { std::string image("-Ximage:"); image.append(image_location.GetFilename()); options.push_back(std::make_pair(image.c_str(), reinterpret_cast(NULL))); - // Turn off implicit checks for this runtime, as we compiled the image with them off. - std::string explicit_checks("-implicit-checks:none"); - options.push_back(std::make_pair(explicit_checks.c_str(), reinterpret_cast(NULL))); if (!Runtime::Create(options, false)) { LOG(FATAL) << "Failed to create runtime"; -- cgit v1.2.3