Change generated code for substring not to bail out to runtime system.

src/ia32/code-stubs-ia32.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 5955 matching lines @@
     // If coming from the make_two_character_string path, the string
     // is too short to be sliced anyways.
     STATIC_ASSERT(2 < SlicedString::kMinLength);
     __ jmp(&copy_routine);
     __ bind(&result_longer_than_two);
 
     // eax: string
     // ebx: instance type
     // ecx: sub string length
     // edx: from index (smi)
-    Label allocate_slice, sliced_string, seq_string;
+    Label allocate_slice, sliced_string, seq_or_external_string;
     __ cmp(ecx, SlicedString::kMinLength);
     // Short slice.  Copy instead of slicing.
     __ j(less, &copy_routine);
-    STATIC_ASSERT(kSeqStringTag == 0);
-    __ test(ebx, Immediate(kStringRepresentationMask));
-    __ j(zero, &seq_string, Label::kNear);
     STATIC_ASSERT(kIsIndirectStringMask == (kSlicedStringTag & kConsStringTag));

[Rico, 2011/11/17 07:27:20]

These two asserts and the following test is a bit hard to follow, please add a
comment explaining that if we don't have an indirect string we have either a
sequential or an external string (I, at least, had to go to objects.h to
convince myself of this)

     STATIC_ASSERT(kIsIndirectStringMask != 0);
     __ test(ebx, Immediate(kIsIndirectStringMask));
-    // External string.  Jump to runtime.
-    __ j(zero, &runtime);
+    __ j(zero, &seq_or_external_string, Label::kNear);
 
     Factory* factory = masm->isolate()->factory();
     __ test(ebx, Immediate(kSlicedNotConsMask));
     __ j(not_zero, &sliced_string, Label::kNear);
     // Cons string.  Check whether it is flat, then fetch first part.
     __ cmp(FieldOperand(eax, ConsString::kSecondOffset),
            factory->empty_string());
     __ j(not_equal, &runtime);
     __ mov(edi, FieldOperand(eax, ConsString::kFirstOffset));
     __ jmp(&allocate_slice, Label::kNear);
 
     __ bind(&sliced_string);
     // Sliced string.  Fetch parent and correct start index by offset.
     __ add(edx, FieldOperand(eax, SlicedString::kOffsetOffset));
     __ mov(edi, FieldOperand(eax, SlicedString::kParentOffset));
     __ jmp(&allocate_slice, Label::kNear);
 
-    __ bind(&seq_string);
-    // Sequential string.  Just move string to the right register.
+    __ bind(&seq_or_external_string);
+    // Sequential or external string.  Just move string to the correct register.
     __ mov(edi, eax);
 
     __ bind(&allocate_slice);
     // edi: underlying subject string
     // ebx: instance type of original subject string
     // edx: offset
     // ecx: length
     // Allocate new sliced string.  At this point we do not reload the instance
     // type including the string encoding because we simply rely on the info
     // provided by the original string.  It does not matter if the original
@@ skipping 1090 matching lines @@
                                  false);
   __ pop(edx);
   __ ret(0);
 }
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32