summaryrefslogtreecommitdiffstats
path: root/compiler/common_compiler_test.h
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-10-14 17:41:57 -0700
committerIan Rogers <irogers@google.com>2014-10-16 19:27:28 -0700
commit6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (patch)
treef7a20779e4d665f948c5fbcd26dac0071dafb8d4 /compiler/common_compiler_test.h
parent2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4 (diff)
downloadandroid_art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.tar.gz
android_art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.tar.bz2
android_art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.zip
Make ART compile with GCC -O0 again.
Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on architecture. Add to instruction_set_test to warn when InstructionSetFeatures don't agree with ones from system properties, AT_HWCAP and /proc/cpuinfo. Clean-up class linker entry point logic to not return entry points but to test whether the passed code is the particular entrypoint. This works around image trampolines that replicate entrypoints. Bug: 17993736 Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23
Diffstat (limited to 'compiler/common_compiler_test.h')
-rw-r--r--compiler/common_compiler_test.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h
index df06b71c7d..20b750c55b 100644
--- a/compiler/common_compiler_test.h
+++ b/compiler/common_compiler_test.h
@@ -81,6 +81,8 @@ class CommonCompilerTest : public CommonRuntimeTest {
std::unique_ptr<CompilerCallbacks> callbacks_;
std::unique_ptr<CompilerDriver> compiler_driver_;
std::unique_ptr<CumulativeLogger> timer_;
+ std::unique_ptr<const InstructionSetFeatures> instruction_set_features_;
+
private:
std::unique_ptr<MemMap> image_reservation_;