diff options
author | 2014-10-14 17:41:57 -0700 | |
---|---|---|
committer | 2014-10-16 19:27:28 -0700 | |
commit | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (patch) | |
tree | f7a20779e4d665f948c5fbcd26dac0071dafb8d4 /compiler/driver/compiler_driver.h | |
parent | 2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4 (diff) |
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/driver/compiler_driver.h')
-rw-r--r-- | compiler/driver/compiler_driver.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index c445683500..0425d272dd 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -88,7 +88,7 @@ class CompilerDriver { DexFileToMethodInlinerMap* method_inliner_map, Compiler::Kind compiler_kind, InstructionSet instruction_set, - InstructionSetFeatures instruction_set_features, + const InstructionSetFeatures* instruction_set_features, bool image, std::set<std::string>* image_classes, size_t thread_count, bool dump_stats, bool dump_passes, CumulativeLogger* timer, std::string profile_file = ""); @@ -115,7 +115,7 @@ class CompilerDriver { return instruction_set_; } - InstructionSetFeatures GetInstructionSetFeatures() const { + const InstructionSetFeatures* GetInstructionSetFeatures() const { return instruction_set_features_; } @@ -475,7 +475,7 @@ class CompilerDriver { std::unique_ptr<Compiler> compiler_; const InstructionSet instruction_set_; - const InstructionSetFeatures instruction_set_features_; + const InstructionSetFeatures* const instruction_set_features_; // All class references that require mutable ReaderWriterMutex freezing_constructor_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; |