diff options
| author | 2017-02-06 11:53:53 +0000 | |
|---|---|---|
| committer | 2017-02-06 11:53:54 +0000 | |
| commit | 85bd7a37139bf79ee664777db079b86a7105dac8 (patch) | |
| tree | c000e4944ba096f9794b5a31a2fc75c56d7db775 /compiler/optimizing/stack_map_stream.cc | |
| parent | f85fc6bd9d65ef4689d6af797adb889da8cf15e3 (diff) | |
| parent | fbdfa6d7485534eedbd3fb32cf572529ebddb63c (diff) | |
Merge "Revert "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, 1 insertions, 5 deletions
diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index e4d480061d..10f5cab907 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -20,6 +20,7 @@ #include "art_method-inl.h" #include "base/stl_util.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, |