diff options
| -rw-r--r-- | runtime/intern_table.cc | 8 | ||||
| -rw-r--r-- | runtime/mirror/string.cc | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc index 524798d..dfc82dd 100644 --- a/runtime/intern_table.cc +++ b/runtime/intern_table.cc @@ -242,15 +242,15 @@ mirror::String* InternTable::Insert(mirror::String* s, bool is_strong) { return InsertWeak(s, hash_code); } -mirror::String* InternTable::InternStrong(int32_t utf16_length, - const char* utf8_data) { +mirror::String* InternTable::InternStrong(int32_t utf16_length, const char* utf8_data) { + DCHECK(utf8_data != nullptr); return InternStrong(mirror::String::AllocFromModifiedUtf8( Thread::Current(), utf16_length, utf8_data)); } mirror::String* InternTable::InternStrong(const char* utf8_data) { - return InternStrong( - mirror::String::AllocFromModifiedUtf8(Thread::Current(), utf8_data)); + DCHECK(utf8_data != nullptr); + return InternStrong(mirror::String::AllocFromModifiedUtf8(Thread::Current(), utf8_data)); } mirror::String* InternTable::InternStrong(mirror::String* s) { diff --git a/runtime/mirror/string.cc b/runtime/mirror/string.cc index 3f35210..d4f11b2 100644 --- a/runtime/mirror/string.cc +++ b/runtime/mirror/string.cc @@ -138,9 +138,7 @@ String* String::AllocFromUtf16(Thread* self, } String* String::AllocFromModifiedUtf8(Thread* self, const char* utf) { - if (UNLIKELY(utf == nullptr)) { - return nullptr; - } + DCHECK(utf != nullptr); size_t char_count = CountModifiedUtf8Chars(utf); return AllocFromModifiedUtf8(self, char_count, utf); } |