Remove all uses of StringShape variables, since that has proven...

src/regexp-macro-assembler-ia32.cc

 // Copyright 2008 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 967 matching lines @@
 }
 
 
 
 RegExpMacroAssemblerIA32::Result RegExpMacroAssemblerIA32::Match(
     Handle<Code> regexp_code,
     Handle<String> subject,
     int* offsets_vector,
     int offsets_vector_length,
     int previous_index) {
-  StringShape shape(*subject);
-
   // Character offsets into string.
   int start_offset = previous_index;
-  int end_offset = subject->length(shape);
+  int end_offset = subject->length();
 
-  if (shape.IsCons()) {
+  if (StringShape(*subject).IsCons()) {
     subject =
       Handle<String>(String::cast(ConsString::cast(*subject)->first()));
-  } else if (shape.IsSliced()) {
+  } else if (StringShape(*subject).IsSliced()) {
     SlicedString* slice = SlicedString::cast(*subject);
     start_offset += slice->start();
     end_offset += slice->start();
     subject = Handle<String>(String::cast(slice->buffer()));
   }
 
   // String is now either Sequential or External
-  StringShape flatshape(*subject);
-  bool is_ascii = flatshape.IsAsciiRepresentation();
+  bool is_ascii = StringShape(*subject).IsAsciiRepresentation();
   int char_size_shift = is_ascii ? 0 : 1;
 
   RegExpMacroAssemblerIA32::Result res;
 
-  if (flatshape.IsExternal()) {
+  if (StringShape(*subject).IsExternal()) {
     const byte* address;
     if (is_ascii) {
       ExternalAsciiString* ext = ExternalAsciiString::cast(*subject);
       address = reinterpret_cast<const byte*>(ext->resource()->data());
     } else {
       ExternalTwoByteString* ext = ExternalTwoByteString::cast(*subject);
       address = reinterpret_cast<const byte*>(ext->resource()->data());
     }
 
     res = Execute(*regexp_code,
@@ skipping 303 matching lines @@
 
 
 void RegExpMacroAssemblerIA32::LoadConstantBufferAddress(Register reg,
                                                          ArraySlice* buffer) {
   __ mov(reg, buffer->array());
   __ add(Operand(reg), Immediate(buffer->base_offset()));
 }
 
 #undef __
 }}  // namespace v8::internal