diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-09-09 06:16:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-09 06:16:41 +0000 |
| commit | 5c9376a0fc6c0b25971d0b92e1de6de4f09ec90c (patch) | |
| tree | c64699ea44ca4a61c828d8a77b743dfd33422f6b /runtime/monitor.cc | |
| parent | 37394eda2161b6e5b0aa361ad82732fbc664946d (diff) | |
| parent | 652984e4b32d06344fae8cad52524d4de7ac5c79 (diff) | |
| download | art-5c9376a0fc6c0b25971d0b92e1de6de4f09ec90c.tar.gz art-5c9376a0fc6c0b25971d0b92e1de6de4f09ec90c.tar.bz2 art-5c9376a0fc6c0b25971d0b92e1de6de4f09ec90c.zip | |
am 652984e4: am 77c318d5: Merge "Fix monitor visit for class initializer" into lmp-dev
* commit '652984e4b32d06344fae8cad52524d4de7ac5c79':
Fix monitor visit for class initializer
Diffstat (limited to 'runtime/monitor.cc')
| -rw-r--r-- | runtime/monitor.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc index a87d7c1fee..6123934d3c 100644 --- a/runtime/monitor.cc +++ b/runtime/monitor.cc @@ -965,12 +965,6 @@ void Monitor::VisitLocks(StackVisitor* stack_visitor, void (*callback)(mirror::O return; } - // <clinit> is another special case. The runtime holds the class lock while calling <clinit>. - if (m->IsClassInitializer()) { - callback(m->GetDeclaringClass(), callback_context); - // Fall through because there might be synchronization in the user code too. - } - // Is there any reason to believe there's any synchronization in this method? const DexFile::CodeItem* code_item = m->GetCodeItem(); CHECK(code_item != NULL) << PrettyMethod(m); |