diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-08-12 17:04:14 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-08-15 10:33:53 -0700 |
| commit | 7571e8b761ebc2c923525e12ea9fcf07e62cb33e (patch) | |
| tree | 5d90ecf4d0ba1a72b040a376f227df1ba9278889 /runtime/entrypoints/entrypoint_utils.cc | |
| parent | 2e250c826b3c405d675017efe79e5db3651c9ee6 (diff) | |
| download | art-7571e8b761ebc2c923525e12ea9fcf07e62cb33e.zip art-7571e8b761ebc2c923525e12ea9fcf07e62cb33e.tar.gz art-7571e8b761ebc2c923525e12ea9fcf07e62cb33e.tar.bz2 | |
Add flock(2)ing on dex-cache files to prevent races
Bug: 9071417
Change-Id: I1ee9ff281867f90fba7a8ed8bbf06b33ac29d511
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index 6b8c41e..bf0fffa 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -269,7 +269,10 @@ mirror::ArtMethod* FindMethodFromCode(uint32_t method_idx, mirror::Object* this_ } void ThrowStackOverflowError(Thread* self) { - CHECK(!self->IsHandlingStackOverflow()) << "Recursive stack overflow."; + if (self->IsHandlingStackOverflow()) { + LOG(ERROR) << "Recursive stack overflow."; + // 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. |