diff options
author | 2017-02-03 09:04:49 +0000 | |
---|---|---|
committer | 2017-02-03 09:04:50 +0000 | |
commit | 3f50d3cda19792d3ac0137e59300b43c542e7dca (patch) | |
tree | 43bbe84313ac903182e5e521b854d05a0f5f4f0b /compiler/optimizing/stack_map_stream.cc | |
parent | 05dfc65a594abe0aeac44bf8b82e381e25eb61d9 (diff) | |
parent | f290c01c61f8a2979efa74ffcd2f54c5e426a3d0 (diff) |
Merge "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, 1 insertions, 5 deletions
diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index 668108daa4..54614bcb2b 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -20,6 +20,7 @@ #include "base/stl_util.h" #include "art_method.h" +#include "optimizing/optimizing_compiler.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" @@ -107,11 +108,6 @@ 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, |