diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-09-20 14:02:02 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-09-20 14:02:02 -0700 |
| commit | 810b1d704f2db0d935bf5dddae3545f79cabd435 (patch) | |
| tree | baf1ec61b47031244cb1fe2458b136c9f9d54f1f /runtime/runtime.cc | |
| parent | 5c00e28cdc7da675451869a2e5baa8f1c3244892 (diff) | |
| parent | bb0140e051e62ca0b51b0870c2386ae3110b0556 (diff) | |
| download | art-810b1d704f2db0d935bf5dddae3545f79cabd435.zip art-810b1d704f2db0d935bf5dddae3545f79cabd435.tar.gz art-810b1d704f2db0d935bf5dddae3545f79cabd435.tar.bz2 | |
resolved conflicts for merge of bb0140e0 to dalvik-dev
Change-Id: I31e0c05c5e917cf3275296a7f65bd8b78ec9b78b
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 05f4566..86a8f1b 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1249,6 +1249,18 @@ mirror::ArtMethod* Runtime::CreateCalleeSaveMethod(InstructionSet instruction_se return method.get(); } +void Runtime::DisallowNewSystemWeaks() { + monitor_list_->DisallowNewMonitors(); + intern_table_->DisallowNewInterns(); + java_vm_->DisallowNewWeakGlobals(); +} + +void Runtime::AllowNewSystemWeaks() { + monitor_list_->AllowNewMonitors(); + intern_table_->AllowNewInterns(); + java_vm_->AllowNewWeakGlobals(); +} + void Runtime::SetCalleeSaveMethod(mirror::ArtMethod* method, CalleeSaveType type) { DCHECK_LT(static_cast<int>(type), static_cast<int>(kLastCalleeSaveType)); callee_save_methods_[type] = method; |