Index: src/ia32/codegen-ia32.cc |
diff --git a/src/ia32/codegen-ia32.cc b/src/ia32/codegen-ia32.cc |
index 339aa716f35afa616e5b8544c42eb512706766c6..ccd159e2991658a55b3f3381a954d824f0a238d5 100644 |
--- a/src/ia32/codegen-ia32.cc |
+++ b/src/ia32/codegen-ia32.cc |
@@ -501,12 +501,9 @@ |
__ j(zero, &check_sequential, Label::kNear); |
// Dispatch on the indirect string shape: slice or cons. |
- Label cons_string, thin_string; |
- __ and_(result, Immediate(kStringRepresentationMask)); |
- __ cmp(result, Immediate(kConsStringTag)); |
- __ j(equal, &cons_string, Label::kNear); |
- __ cmp(result, Immediate(kThinStringTag)); |
- __ j(equal, &thin_string, Label::kNear); |
+ Label cons_string; |
+ __ test(result, Immediate(kSlicedNotConsMask)); |
+ __ j(zero, &cons_string, Label::kNear); |
// Handle slices. |
Label indirect_string_loaded; |
@@ -514,11 +511,6 @@ |
__ SmiUntag(result); |
__ add(index, result); |
__ mov(string, FieldOperand(string, SlicedString::kParentOffset)); |
- __ jmp(&indirect_string_loaded, Label::kNear); |
- |
- // Handle thin strings. |
- __ bind(&thin_string); |
- __ mov(string, FieldOperand(string, ThinString::kActualOffset)); |
__ jmp(&indirect_string_loaded, Label::kNear); |
// Handle cons strings. |