diff options
| author | Jeff Hao <jeffhao@google.com> | 2014-09-03 13:48:16 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-09-04 09:57:38 -0700 |
| commit | 68caf9e7232109c698e7f91f64b348cf37b432dd (patch) | |
| tree | 2a7a5390eb54ceb846f0cee1afd956076216695e /runtime/entrypoints/entrypoint_utils.cc | |
| parent | 5355835411cafcc2772e061cb7aef3b8ca1e6ea1 (diff) | |
| download | android_art-68caf9e7232109c698e7f91f64b348cf37b432dd.tar.gz android_art-68caf9e7232109c698e7f91f64b348cf37b432dd.tar.bz2 android_art-68caf9e7232109c698e7f91f64b348cf37b432dd.zip | |
Fix stack overflow and duplicate methods while tracing.
Bug: 16386215
Change-Id: I0d0ae0113a3a00013ce84a1f5a110e2c52f19b86
(cherry picked from commit 6b28a456b075fe53dfb7e924a44dbf35d0d41eb3)
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index e1c532ece4..d834d4d115 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -114,11 +114,6 @@ void ThrowStackOverflowError(Thread* self) { // We don't fail here because SetStackEndForStackOverflow will print better diagnostics. } - if (Runtime::Current()->GetInstrumentation()->AreExitStubsInstalled()) { - // Remove extra entry pushed onto second stack during method tracing. - Runtime::Current()->GetInstrumentation()->PopMethodForUnwind(self, false); - } - self->SetStackEndForStackOverflow(); // Allow space on the stack for constructor to execute. JNIEnvExt* env = self->GetJniEnv(); std::string msg("stack size "); |