diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-29 20:52:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-29 20:52:59 +0000 |
| commit | 68e22f3b982ff9ccbdfb3b65b7cfc16fcae907ba (patch) | |
| tree | 9de353620b2cd8712e3ae8e37352bcd6133217de /runtime/runtime.cc | |
| parent | d6c93101f81fbdcd68b0fa2965d8af3877d15ea4 (diff) | |
| parent | 4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6 (diff) | |
| download | art-68e22f3b982ff9ccbdfb3b65b7cfc16fcae907ba.zip art-68e22f3b982ff9ccbdfb3b65b7cfc16fcae907ba.tar.gz art-68e22f3b982ff9ccbdfb3b65b7cfc16fcae907ba.tar.bz2 | |
Merge "ART: Some runtime cleanup"
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index ffe3dc6..c462153 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -50,9 +50,11 @@ #include "arch/x86_64/registers_x86_64.h" #include "asm_support.h" #include "atomic.h" +#include "base/arena_allocator.h" #include "base/dumpable.h" #include "base/unix_file/fd_file.h" #include "class_linker.h" +#include "compiler_callbacks.h" #include "debugger.h" #include "elf_file.h" #include "entrypoints/runtime_asm_entrypoints.h" @@ -1653,4 +1655,12 @@ void Runtime::CreateJit() { } } +bool Runtime::CanRelocate() const { + return !IsAotCompiler() || compiler_callbacks_->IsRelocationPossible(); +} + +bool Runtime::IsCompilingBootImage() const { + return IsCompiler() && compiler_callbacks_->IsBootImage(); +} + } // namespace art |