diff options
| author | 2017-02-03 10:36:08 +0000 | |
|---|---|---|
| committer | 2017-02-03 10:36:09 +0000 | |
| commit | d90cd5c435743379e592464f5443d7e86a102d01 (patch) | |
| tree | daeb59237c9c51609f0ebab500467a840559d90d /compiler/optimizing/stack_map_stream.cc | |
| parent | 3f50d3cda19792d3ac0137e59300b43c542e7dca (diff) | |
| parent | d16da8bd8106452eea82408748dc6b3fd64bcb80 (diff) | |
Merge "Revert "Inline across dex files for JIT.""
Diffstat (limited to 'compiler/optimizing/stack_map_stream.cc')
| -rw-r--r-- | compiler/optimizing/stack_map_stream.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index 54614bcb2b..668108daa4 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -20,7 +20,6 @@ #include "base/stl_util.h" #include "art_method.h" -#include "optimizing/optimizing_compiler.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" @@ -108,6 +107,11 @@ void StackMapStream::AddDexRegisterEntry(DexRegisterLocation::Kind kind, int32_t current_dex_register_++; } +static bool EncodeArtMethodInInlineInfo(ArtMethod* method ATTRIBUTE_UNUSED) { + // Note: the runtime is null only for unit testing. + return Runtime::Current() == nullptr || !Runtime::Current()->IsAotCompiler(); +} + void StackMapStream::BeginInlineInfoEntry(ArtMethod* method, uint32_t dex_pc, uint32_t num_dex_registers, |