Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1723)

Unified Diff: src/arm64/codegen-arm64.cc

Issue 2549773002: Internalize strings in-place (Closed)
Patch Set: forgot one Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/arm64/codegen-arm64.cc
diff --git a/src/arm64/codegen-arm64.cc b/src/arm64/codegen-arm64.cc
index e6ddcfadb8dadfb221c93b293f9c7430fb4edfe2..10dc83bb6e8769885f67a97dc32fef7534d16d60 100644
--- a/src/arm64/codegen-arm64.cc
+++ b/src/arm64/codegen-arm64.cc
@@ -108,8 +108,12 @@ void StringCharLoadGenerator::Generate(MacroAssembler* masm,
__ TestAndBranchIfAllClear(result, kIsIndirectStringMask, &check_sequential);
// Dispatch on the indirect string shape: slice or cons.
- Label cons_string;
- __ TestAndBranchIfAllClear(result, kSlicedNotConsMask, &cons_string);
+ Label cons_string, thin_string;
+ __ And(result, result, kStringRepresentationMask);
+ __ Cmp(result, kConsStringTag);
+ __ B(eq, &cons_string);
+ __ Cmp(result, kThinStringTag);
+ __ B(eq, &thin_string);
// Handle slices.
Label indirect_string_loaded;
@@ -119,6 +123,11 @@ void StringCharLoadGenerator::Generate(MacroAssembler* masm,
__ Add(index, index, result.W());
__ B(&indirect_string_loaded);
+ // Handle thin strings.
+ __ Bind(&thin_string);
+ __ Ldr(string, FieldMemOperand(string, ThinString::kActualOffset));
+ __ B(&indirect_string_loaded);
+
// Handle cons strings.
// Check whether the right hand side is the empty string (i.e. if
// this is really a flat string in a cons string). If that is not
« no previous file with comments | « src/arm64/code-stubs-arm64.cc ('k') | src/ast/ast-types.cc » ('j') | src/code-stub-assembler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698