diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-02-28 17:18:37 -0800 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-02-28 17:34:30 -0800 |
| commit | 563b47cc142e477da244539b1d63070425e7fd78 (patch) | |
| tree | 3da2bb5ccdcd16f7104211855d47ece3f1d24767 /runtime/interpreter/interpreter_common.cc | |
| parent | e58d0203351d9740a8f74a140fdee342168e6552 (diff) | |
| download | art-563b47cc142e477da244539b1d63070425e7fd78.zip art-563b47cc142e477da244539b1d63070425e7fd78.tar.gz art-563b47cc142e477da244539b1d63070425e7fd78.tar.bz2 | |
Fix the bug that some compiled code was invoked with -Xint.
Some compiled code (probably static methods) is still being invoked
with -Xint. Added an assert to detect this case.
Bug: 13250375
Change-Id: Iecfe8ef40c6c326962593db78e6e1d9f1c93842e
Diffstat (limited to 'runtime/interpreter/interpreter_common.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_common.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index f76d50c..e8cea9d 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -155,6 +155,11 @@ bool DoCall(ArtMethod* method, Thread* self, ShadowFrame& shadow_frame, if (kIsDebugBuild && method->GetEntryPointFromInterpreter() == nullptr) { LOG(FATAL) << "Attempt to invoke non-executable method: " << PrettyMethod(method); } + if (kIsDebugBuild && Runtime::Current()->GetInstrumentation()->IsForcedInterpretOnly() && + !method->IsNative() && !method->IsProxyMethod() && + method->GetEntryPointFromInterpreter() == artInterpreterToCompiledCodeBridge) { + LOG(FATAL) << "Attempt to call compiled code when -Xint: " << PrettyMethod(method); + } (method->GetEntryPointFromInterpreter())(self, mh, code_item, new_shadow_frame, result); } else { UnstartedRuntimeInvoke(self, mh, code_item, new_shadow_frame, result, first_dest_reg); |