diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-27 23:45:15 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-27 23:46:09 -0700 |
| commit | 4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6 (patch) | |
| tree | e9dfed086f56245e74862caa813c708bc4f500f9 /runtime/runtime.h | |
| parent | e2c29f4a2717923f190c944a06e02f7d8c3ddcb6 (diff) | |
| download | android_art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.tar.gz android_art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.tar.bz2 android_art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.zip | |
ART: Some runtime cleanup
Use an enum for the compiler-callback mode.
Refactor and remove some unnecessary includes in runtime.h.
Change-Id: If2245fa470171311b8e05b677cf6bb28f209585a
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index 7181097563..085335fd3c 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -27,10 +27,7 @@ #include <vector> #include "arch/instruction_set.h" -#include "base/allocator.h" -#include "base/arena_allocator.h" #include "base/macros.h" -#include "compiler_callbacks.h" #include "gc_root.h" #include "instrumentation.h" #include "jobject_comparator.h" @@ -43,6 +40,9 @@ namespace art { +class ArenaPool; +class CompilerCallbacks; + namespace gc { class Heap; namespace collector { @@ -112,9 +112,10 @@ class Runtime { return compiler_callbacks_ != nullptr; } - bool CanRelocate() const { - return !IsAotCompiler() || compiler_callbacks_->IsRelocationPossible(); - } + // If a compiler, are we compiling a boot image? + bool IsCompilingBootImage() const; + + bool CanRelocate() const; bool ShouldRelocate() const { return must_relocate_ && CanRelocate(); |