Elliott Hughes | 2faa5f1 | 2012-01-30 14:42:07 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2011 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 16 | |
| 17 | #include "intern_table.h" |
| 18 | |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 19 | #include "gc/space/image_space.h" |
| 20 | #include "mirror/dex_cache.h" |
| 21 | #include "mirror/object_array-inl.h" |
| 22 | #include "mirror/object-inl.h" |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 23 | #include "mirror/string.h" |
| 24 | #include "thread.h" |
Elliott Hughes | 90a3369 | 2011-08-30 13:27:07 -0700 | [diff] [blame] | 25 | #include "UniquePtr.h" |
Elliott Hughes | 814e403 | 2011-08-23 12:07:56 -0700 | [diff] [blame] | 26 | #include "utf.h" |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 27 | |
| 28 | namespace art { |
| 29 | |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 30 | InternTable::InternTable() |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 31 | : is_dirty_(false), allow_new_interns_(true), |
| 32 | new_intern_condition_("New intern condition", *Locks::intern_table_lock_) { |
Mathieu Chartier | c11d9b8 | 2013-09-19 10:01:59 -0700 | [diff] [blame] | 33 | } |
Elliott Hughes | de69d7f | 2011-08-18 16:49:37 -0700 | [diff] [blame] | 34 | |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 35 | size_t InternTable::Size() const { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 36 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 37 | return strong_interns_.size() + weak_interns_.size(); |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 38 | } |
| 39 | |
Elliott Hughes | cac6cc7 | 2011-11-03 20:31:21 -0700 | [diff] [blame] | 40 | void InternTable::DumpForSigQuit(std::ostream& os) const { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 41 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Elliott Hughes | cac6cc7 | 2011-11-03 20:31:21 -0700 | [diff] [blame] | 42 | os << "Intern table: " << strong_interns_.size() << " strong; " |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 43 | << weak_interns_.size() << " weak\n"; |
Elliott Hughes | cac6cc7 | 2011-11-03 20:31:21 -0700 | [diff] [blame] | 44 | } |
| 45 | |
Mathieu Chartier | 83c8ee0 | 2014-01-28 14:50:23 -0800 | [diff] [blame] | 46 | void InternTable::VisitRoots(RootCallback* callback, void* arg, |
Mathieu Chartier | c462198 | 2013-09-16 19:43:47 -0700 | [diff] [blame] | 47 | bool only_dirty, bool clean_dirty) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 48 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | c462198 | 2013-09-16 19:43:47 -0700 | [diff] [blame] | 49 | if (!only_dirty || is_dirty_) { |
Mathieu Chartier | b307052 | 2013-09-17 14:18:21 -0700 | [diff] [blame] | 50 | for (auto& strong_intern : strong_interns_) { |
Mathieu Chartier | 83c8ee0 | 2014-01-28 14:50:23 -0800 | [diff] [blame] | 51 | strong_intern.second = |
| 52 | down_cast<mirror::String*>(callback(strong_intern.second, arg, 0, |
| 53 | kRootInternedString)); |
Mathieu Chartier | b307052 | 2013-09-17 14:18:21 -0700 | [diff] [blame] | 54 | DCHECK(strong_intern.second != nullptr); |
Mathieu Chartier | c462198 | 2013-09-16 19:43:47 -0700 | [diff] [blame] | 55 | } |
| 56 | if (clean_dirty) { |
| 57 | is_dirty_ = false; |
| 58 | } |
Ian Rogers | 1d54e73 | 2013-05-02 21:10:01 -0700 | [diff] [blame] | 59 | } |
Mathieu Chartier | 423d2a3 | 2013-09-12 17:33:56 -0700 | [diff] [blame] | 60 | // Note: we deliberately don't visit the weak_interns_ table and the immutable image roots. |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 61 | } |
| 62 | |
Mathieu Chartier | 590fee9 | 2013-09-13 13:46:47 -0700 | [diff] [blame] | 63 | mirror::String* InternTable::Lookup(Table& table, mirror::String* s, uint32_t hash_code) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 64 | Locks::intern_table_lock_->AssertHeld(Thread::Current()); |
Mathieu Chartier | 02e2511 | 2013-08-14 16:14:24 -0700 | [diff] [blame] | 65 | for (auto it = table.find(hash_code), end = table.end(); it != end; ++it) { |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 66 | mirror::String* existing_string = it->second; |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 67 | if (existing_string->Equals(s)) { |
| 68 | return existing_string; |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 69 | } |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 70 | } |
| 71 | return NULL; |
| 72 | } |
| 73 | |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 74 | mirror::String* InternTable::InsertStrong(mirror::String* s, uint32_t hash_code) { |
| 75 | Runtime* runtime = Runtime::Current(); |
| 76 | if (runtime->IsActiveTransaction()) { |
| 77 | runtime->RecordStrongStringInsertion(s, hash_code); |
| 78 | } |
| 79 | return Insert(strong_interns_, s, hash_code); |
| 80 | } |
| 81 | |
| 82 | mirror::String* InternTable::InsertWeak(mirror::String* s, uint32_t hash_code) { |
| 83 | Runtime* runtime = Runtime::Current(); |
| 84 | if (runtime->IsActiveTransaction()) { |
| 85 | runtime->RecordWeakStringInsertion(s, hash_code); |
| 86 | } |
| 87 | return Insert(weak_interns_, s, hash_code); |
| 88 | } |
| 89 | |
Mathieu Chartier | 590fee9 | 2013-09-13 13:46:47 -0700 | [diff] [blame] | 90 | mirror::String* InternTable::Insert(Table& table, mirror::String* s, uint32_t hash_code) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 91 | Locks::intern_table_lock_->AssertHeld(Thread::Current()); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 92 | table.insert(std::make_pair(hash_code, s)); |
| 93 | return s; |
| 94 | } |
| 95 | |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 96 | void InternTable::RemoveWeak(mirror::String* s, uint32_t hash_code) { |
| 97 | Runtime* runtime = Runtime::Current(); |
| 98 | if (runtime->IsActiveTransaction()) { |
| 99 | runtime->RecordWeakStringRemoval(s, hash_code); |
| 100 | } |
| 101 | Remove(weak_interns_, s, hash_code); |
| 102 | } |
| 103 | |
| 104 | void InternTable::Remove(Table& table, mirror::String* s, uint32_t hash_code) { |
| 105 | Locks::intern_table_lock_->AssertHeld(Thread::Current()); |
Mathieu Chartier | 02e2511 | 2013-08-14 16:14:24 -0700 | [diff] [blame] | 106 | for (auto it = table.find(hash_code), end = table.end(); it != end; ++it) { |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 107 | if (it->second == s) { |
| 108 | table.erase(it); |
| 109 | return; |
| 110 | } |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 111 | } |
| 112 | } |
| 113 | |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 114 | // Insert/remove methods used to undo changes made during an aborted transaction. |
| 115 | mirror::String* InternTable::InsertStrongFromTransaction(mirror::String* s, uint32_t hash_code) { |
| 116 | DCHECK(!Runtime::Current()->IsActiveTransaction()); |
| 117 | return InsertStrong(s, hash_code); |
| 118 | } |
| 119 | mirror::String* InternTable::InsertWeakFromTransaction(mirror::String* s, uint32_t hash_code) { |
| 120 | DCHECK(!Runtime::Current()->IsActiveTransaction()); |
| 121 | return InsertWeak(s, hash_code); |
| 122 | } |
| 123 | void InternTable::RemoveStrongFromTransaction(mirror::String* s, uint32_t hash_code) { |
| 124 | DCHECK(!Runtime::Current()->IsActiveTransaction()); |
| 125 | Remove(strong_interns_, s, hash_code); |
| 126 | } |
| 127 | void InternTable::RemoveWeakFromTransaction(mirror::String* s, uint32_t hash_code) { |
| 128 | DCHECK(!Runtime::Current()->IsActiveTransaction()); |
| 129 | Remove(weak_interns_, s, hash_code); |
| 130 | } |
| 131 | |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 132 | static mirror::String* LookupStringFromImage(mirror::String* s) |
| 133 | SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { |
| 134 | gc::space::ImageSpace* image = Runtime::Current()->GetHeap()->GetImageSpace(); |
| 135 | if (image == NULL) { |
| 136 | return NULL; // No image present. |
| 137 | } |
| 138 | mirror::Object* root = image->GetImageHeader().GetImageRoot(ImageHeader::kDexCaches); |
| 139 | mirror::ObjectArray<mirror::DexCache>* dex_caches = root->AsObjectArray<mirror::DexCache>(); |
| 140 | const std::string utf8 = s->ToModifiedUtf8(); |
| 141 | for (int32_t i = 0; i < dex_caches->GetLength(); ++i) { |
| 142 | mirror::DexCache* dex_cache = dex_caches->Get(i); |
| 143 | const DexFile* dex_file = dex_cache->GetDexFile(); |
| 144 | // Binary search the dex file for the string index. |
| 145 | const DexFile::StringId* string_id = dex_file->FindStringId(utf8.c_str()); |
| 146 | if (string_id != NULL) { |
| 147 | uint32_t string_idx = dex_file->GetIndexForStringId(*string_id); |
| 148 | mirror::String* image = dex_cache->GetResolvedString(string_idx); |
| 149 | if (image != NULL) { |
| 150 | return image; |
| 151 | } |
| 152 | } |
| 153 | } |
| 154 | return NULL; |
| 155 | } |
| 156 | |
Mathieu Chartier | c11d9b8 | 2013-09-19 10:01:59 -0700 | [diff] [blame] | 157 | void InternTable::AllowNewInterns() { |
| 158 | Thread* self = Thread::Current(); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 159 | MutexLock mu(self, *Locks::intern_table_lock_); |
Mathieu Chartier | c11d9b8 | 2013-09-19 10:01:59 -0700 | [diff] [blame] | 160 | allow_new_interns_ = true; |
| 161 | new_intern_condition_.Broadcast(self); |
| 162 | } |
| 163 | |
| 164 | void InternTable::DisallowNewInterns() { |
| 165 | Thread* self = Thread::Current(); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 166 | MutexLock mu(self, *Locks::intern_table_lock_); |
Mathieu Chartier | c11d9b8 | 2013-09-19 10:01:59 -0700 | [diff] [blame] | 167 | allow_new_interns_ = false; |
| 168 | } |
| 169 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 170 | mirror::String* InternTable::Insert(mirror::String* s, bool is_strong) { |
Mathieu Chartier | c11d9b8 | 2013-09-19 10:01:59 -0700 | [diff] [blame] | 171 | Thread* self = Thread::Current(); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 172 | MutexLock mu(self, *Locks::intern_table_lock_); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 173 | |
| 174 | DCHECK(s != NULL); |
| 175 | uint32_t hash_code = s->GetHashCode(); |
| 176 | |
Mathieu Chartier | c11d9b8 | 2013-09-19 10:01:59 -0700 | [diff] [blame] | 177 | while (UNLIKELY(!allow_new_interns_)) { |
| 178 | new_intern_condition_.WaitHoldingLocks(self); |
| 179 | } |
| 180 | |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 181 | if (is_strong) { |
jeffhao | b1c6f34 | 2012-03-20 17:57:26 -0700 | [diff] [blame] | 182 | // Check the strong table for a match. |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 183 | mirror::String* strong = Lookup(strong_interns_, s, hash_code); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 184 | if (strong != NULL) { |
| 185 | return strong; |
| 186 | } |
| 187 | |
Mathieu Chartier | 9ebae1f | 2012-10-15 17:38:16 -0700 | [diff] [blame] | 188 | // Mark as dirty so that we rescan the roots. |
Mathieu Chartier | c462198 | 2013-09-16 19:43:47 -0700 | [diff] [blame] | 189 | is_dirty_ = true; |
Mathieu Chartier | 9ebae1f | 2012-10-15 17:38:16 -0700 | [diff] [blame] | 190 | |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 191 | // Check the image for a match. |
| 192 | mirror::String* image = LookupStringFromImage(s); |
| 193 | if (image != NULL) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 194 | return InsertStrong(image, hash_code); |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 195 | } |
| 196 | |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 197 | // There is no match in the strong table, check the weak table. |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 198 | mirror::String* weak = Lookup(weak_interns_, s, hash_code); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 199 | if (weak != NULL) { |
| 200 | // A match was found in the weak table. Promote to the strong table. |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 201 | RemoveWeak(weak, hash_code); |
| 202 | return InsertStrong(weak, hash_code); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 203 | } |
| 204 | |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 205 | // No match in the strong table or the weak table. Insert into the strong |
| 206 | // table. |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 207 | return InsertStrong(s, hash_code); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 208 | } |
| 209 | |
| 210 | // Check the strong table for a match. |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 211 | mirror::String* strong = Lookup(strong_interns_, s, hash_code); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 212 | if (strong != NULL) { |
| 213 | return strong; |
| 214 | } |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 215 | // Check the image for a match. |
| 216 | mirror::String* image = LookupStringFromImage(s); |
jeffhao | b1c6f34 | 2012-03-20 17:57:26 -0700 | [diff] [blame] | 217 | if (image != NULL) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 218 | return InsertWeak(image, hash_code); |
jeffhao | b1c6f34 | 2012-03-20 17:57:26 -0700 | [diff] [blame] | 219 | } |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 220 | // Check the weak table for a match. |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 221 | mirror::String* weak = Lookup(weak_interns_, s, hash_code); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 222 | if (weak != NULL) { |
| 223 | return weak; |
| 224 | } |
| 225 | // Insert into the weak table. |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 226 | return InsertWeak(s, hash_code); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 227 | } |
| 228 | |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 229 | mirror::String* InternTable::InternStrong(int32_t utf16_length, |
| 230 | const char* utf8_data) { |
| 231 | return InternStrong(mirror::String::AllocFromModifiedUtf8( |
| 232 | Thread::Current(), utf16_length, utf8_data)); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 233 | } |
| 234 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 235 | mirror::String* InternTable::InternStrong(const char* utf8_data) { |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 236 | return InternStrong( |
| 237 | mirror::String::AllocFromModifiedUtf8(Thread::Current(), utf8_data)); |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 238 | } |
| 239 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 240 | mirror::String* InternTable::InternStrong(mirror::String* s) { |
Mathieu Chartier | 83c8ee0 | 2014-01-28 14:50:23 -0800 | [diff] [blame] | 241 | if (s == nullptr) { |
| 242 | return nullptr; |
Elliott Hughes | 37d4e6b | 2011-10-13 12:05:20 -0700 | [diff] [blame] | 243 | } |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 244 | return Insert(s, true); |
| 245 | } |
| 246 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 247 | mirror::String* InternTable::InternWeak(mirror::String* s) { |
Mathieu Chartier | 83c8ee0 | 2014-01-28 14:50:23 -0800 | [diff] [blame] | 248 | if (s == nullptr) { |
| 249 | return nullptr; |
Elliott Hughes | 37d4e6b | 2011-10-13 12:05:20 -0700 | [diff] [blame] | 250 | } |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 251 | return Insert(s, false); |
| 252 | } |
| 253 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 254 | bool InternTable::ContainsWeak(mirror::String* s) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 255 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 256 | const mirror::String* found = Lookup(weak_interns_, s, s->GetHashCode()); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 257 | return found == s; |
| 258 | } |
| 259 | |
Mathieu Chartier | 83c8ee0 | 2014-01-28 14:50:23 -0800 | [diff] [blame] | 260 | void InternTable::SweepInternTableWeaks(IsMarkedCallback* callback, void* arg) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame^] | 261 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | 02e2511 | 2013-08-14 16:14:24 -0700 | [diff] [blame] | 262 | for (auto it = weak_interns_.begin(), end = weak_interns_.end(); it != end;) { |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 263 | mirror::Object* object = it->second; |
Mathieu Chartier | 83c8ee0 | 2014-01-28 14:50:23 -0800 | [diff] [blame] | 264 | mirror::Object* new_object = callback(object, arg); |
Mathieu Chartier | 6aa3df9 | 2013-09-17 15:17:28 -0700 | [diff] [blame] | 265 | if (new_object == nullptr) { |
| 266 | // TODO: use it = weak_interns_.erase(it) when we get a c++11 stl. |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 267 | weak_interns_.erase(it++); |
| 268 | } else { |
Mathieu Chartier | 6aa3df9 | 2013-09-17 15:17:28 -0700 | [diff] [blame] | 269 | it->second = down_cast<mirror::String*>(new_object); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 270 | ++it; |
| 271 | } |
| 272 | } |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 273 | } |
| 274 | |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 275 | } // namespace art |