Push string shape fixes to trunk (version 0.4.3.1).

src/conversions.cc

 // Copyright 2006-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 103 matching lines @@
 
 
 static inline bool SubStringEquals(const char* str,
                                    int index,
                                    const char* other) {
   return strncmp(str + index, other, strlen(other)) != 0;
 }
 
 
 static inline bool SubStringEquals(String* str, int index, const char* other) {
-  StringShape shape(str);
   HandleScope scope;
-  int str_length = str->length(shape);
+  int str_length = str->length();
   int other_length = strlen(other);
   int end = index + other_length < str_length ?
             index + other_length :
             str_length;
   Handle<String> slice =
-      Factory::NewStringSlice(Handle<String>(str), shape, index, end);
+      Factory::NewStringSlice(Handle<String>(str), index, end);
   return slice->IsEqualTo(Vector<const char>(other, other_length));
 }
 
 
 // Check if a string should be parsed as an octal number.  The string
 // can be either a char* or a String*.
 template<class S>
 static bool ShouldParseOctal(S* s, int i) {
   int index = i;
   int len = GetLength(s);
@@ skipping 559 matching lines @@
   // Allocate result and fill in the parts.
   StringBuilder builder(result_size + 1);
   builder.AddSubstring(integer_buffer + integer_pos + 1, integer_part_size);
   if (decimal_pos > 0) builder.AddCharacter('.');
   builder.AddSubstring(decimal_buffer, decimal_pos);
   return builder.Finalize();
 }
 
 
 } }  // namespace v8::internal