From 9b81ac36e161fd993eab17b43b93a96e8c63b5cc Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 16 May 2019 16:47:08 +0100 Subject: Add default argument kIsInstrumented=true. kIsInstrumented=false is reserved for use by specialized entrypoints which are used only when we can ensure that the code is not instrumented. So add the default argument to simplify all other callers. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Change-Id: I3419795794fec9a1733ab3ad698b6415dbac679d --- runtime/mirror/string.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/mirror/string.cc') diff --git a/runtime/mirror/string.cc b/runtime/mirror/string.cc index 1881c5782c..b2b68d6fde 100644 --- a/runtime/mirror/string.cc +++ b/runtime/mirror/string.cc @@ -89,7 +89,7 @@ ObjPtr String::DoReplace(Thread* self, Handle src, uint16_t old_ gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator(); const int32_t length_with_flag = String::GetFlaggedCount(length, compressible); SetStringCountVisitor visitor(length_with_flag); - ObjPtr string = Alloc(self, length_with_flag, allocator_type, visitor); + ObjPtr string = Alloc(self, length_with_flag, allocator_type, visitor); if (UNLIKELY(string == nullptr)) { return nullptr; } @@ -130,7 +130,7 @@ ObjPtr String::AllocFromStrings(Thread* self, const int32_t length_with_flag = String::GetFlaggedCount(length + length2, compressible); SetStringCountVisitor visitor(length_with_flag); - ObjPtr new_string = Alloc(self, length_with_flag, allocator_type, visitor); + ObjPtr new_string = Alloc(self, length_with_flag, allocator_type, visitor); if (UNLIKELY(new_string == nullptr)) { return nullptr; } @@ -167,7 +167,7 @@ ObjPtr String::AllocFromUtf16(Thread* self, String::AllASCII(utf16_data_in, utf16_length); int32_t length_with_flag = String::GetFlaggedCount(utf16_length, compressible); SetStringCountVisitor visitor(length_with_flag); - ObjPtr string = Alloc(self, length_with_flag, allocator_type, visitor); + ObjPtr string = Alloc(self, length_with_flag, allocator_type, visitor); if (UNLIKELY(string == nullptr)) { return nullptr; } @@ -203,7 +203,7 @@ ObjPtr String::AllocFromModifiedUtf8(Thread* self, const bool compressible = kUseStringCompression && (utf16_length == utf8_length); const int32_t utf16_length_with_flag = String::GetFlaggedCount(utf16_length, compressible); SetStringCountVisitor visitor(utf16_length_with_flag); - ObjPtr string = Alloc(self, utf16_length_with_flag, allocator_type, visitor); + ObjPtr string = Alloc(self, utf16_length_with_flag, allocator_type, visitor); if (UNLIKELY(string == nullptr)) { return nullptr; } -- cgit v1.2.3-59-g8ed1b