diff options
| author | 2020-10-27 10:36:06 +0000 | |
|---|---|---|
| committer | 2020-10-28 09:43:42 +0000 | |
| commit | 036b0708c12a33469db4a5adde9ded152b5eb700 (patch) | |
| tree | 59fd4ce1126da0bec264431c1056f93eceb07c38 /runtime/native/java_lang_String.cc | |
| parent | 8b2f7e67096c5a12f950f5ffe8f5ed4704299c57 (diff) | |
Rename String.concat() implementation function.
Rename String::AllocFromStrings() to String::DoConcat() and
rename arguments to h_this and h_arg.
This addresses a comment from
https://android-review.googlesource.com/1473728 .
Test: testrunner.py --host --optimizing -t 021-string2
Bug: 169674485
Change-Id: I830541b64b51c0170aa5455cbad7cc86f4349f13
Diffstat (limited to 'runtime/native/java_lang_String.cc')
| -rw-r--r-- | runtime/native/java_lang_String.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc index 7c7c5537fb..86f93299d9 100644 --- a/runtime/native/java_lang_String.cc +++ b/runtime/native/java_lang_String.cc @@ -60,8 +60,7 @@ static jstring String_concat(JNIEnv* env, jobject java_this, jstring java_string int32_t length_this = string_this->GetLength(); int32_t length_arg = string_arg->GetLength(); if (length_arg > 0 && length_this > 0) { - ObjPtr<mirror::String> result = - mirror::String::AllocFromStrings(soa.Self(), string_this, string_arg); + ObjPtr<mirror::String> result = mirror::String::DoConcat(soa.Self(), string_this, string_arg); return soa.AddLocalReference<jstring>(result); } jobject string_original = (length_this == 0) ? java_string_arg : java_this; |