commit a5d718a9f8ef51e41a1485a0f6ab201aec4c0c82
author Vladimir Marko <vmarko@google.com> Mon Sep 12 15:03:45 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 12 15:03:46 2016 +0000
tree dd76dde4b405235f234fb13aa0a14874bda42f70
parent 935cf1b7a5e55a8d9aeab7e8955012849f0c1b68
parent d2bdb9b857cccd15735572ffca846d875f8eb3f9

Merge "Try to avoid allocation when interning strings."

runtime/intern_table.cc

diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc
index 1940d67..be061be 100644
--- a/runtime/intern_table.cc
+++ b/runtime/intern_table.cc
@@ -316,8 +316,14 @@
 
 mirror::String* InternTable::InternStrong(int32_t utf16_length, const char* utf8_data) {
   DCHECK(utf8_data != nullptr);
+  Thread* self = Thread::Current();
+  // Try to avoid allocation.
+  mirror::String* s = LookupStrong(self, utf16_length, utf8_data);
+  if (s != nullptr) {
+    return s;
+  }
   return InternStrong(mirror::String::AllocFromModifiedUtf8(
-      Thread::Current(), utf16_length, utf8_data));
+      self, utf16_length, utf8_data));
 }
 
 mirror::String* InternTable::InternStrong(const char* utf8_data) {