diff options
author | 2015-10-07 16:59:56 +0000 | |
---|---|---|
committer | 2015-10-07 16:59:56 +0000 | |
commit | 9be16fe2cd19a555092512c16afde50f79e80e3d (patch) | |
tree | 28c4950dff3700f69e3d32fc496890a722cfc379 /runtime/interpreter/interpreter.cc | |
parent | f4156986d1ba5b6dd7dfe89754c8562557cd1bc5 (diff) | |
parent | 3cfa4d05afa76e19ca99ec964b535a15c73683f0 (diff) |
Merge "ART: Remove interpreter entrypoints"
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
-rw-r--r-- | runtime/interpreter/interpreter.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index f783b04b95..2a76f94688 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -14,10 +14,11 @@ * limitations under the License. */ -#include "interpreter_common.h" +#include "interpreter.h" #include <limits> +#include "interpreter_common.h" #include "mirror/string-inl.h" #include "scoped_thread_state_change.h" #include "ScopedLocalRef.h" @@ -448,8 +449,8 @@ JValue EnterInterpreterFromEntryPoint(Thread* self, const DexFile::CodeItem* cod return Execute(self, code_item, *shadow_frame, JValue()); } -extern "C" void artInterpreterToInterpreterBridge(Thread* self, const DexFile::CodeItem* code_item, - ShadowFrame* shadow_frame, JValue* result) { +void ArtInterpreterToInterpreterBridge(Thread* self, const DexFile::CodeItem* code_item, + ShadowFrame* shadow_frame, JValue* result) { bool implicit_check = !Runtime::Current()->ExplicitStackOverflowChecks(); if (UNLIKELY(__builtin_frame_address(0) < self->GetStackEndForInterpreter(implicit_check))) { ThrowStackOverflowError(self); |