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

test/cctest/test-heap.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 
 #include <stdlib.h>
 
 #include "v8.h"
 
 #include "execution.h"
 #include "factory.h"
 #include "macro-assembler.h"
 #include "global-handles.h"
@@ skipping 236 matching lines @@
   CHECK(Top::context()->global()->HasLocalProperty(obj_name));
   CHECK(Top::context()->global()->GetProperty(obj_name)->IsJSObject());
   obj = JSObject::cast(Top::context()->global()->GetProperty(obj_name));
   prop_name = String::cast(Heap::LookupAsciiSymbol("theSlot"));
   CHECK_EQ(Smi::FromInt(23), obj->GetProperty(prop_name));
 }
 
 
 static void VerifyStringAllocation(const char* string) {
   String* s = String::cast(Heap::AllocateStringFromUtf8(CStrVector(string)));
-  StringShape shape(s);
-  CHECK_EQ(static_cast<int>(strlen(string)), s->length(shape));
-  for (int index = 0; index < s->length(shape); index++) {
-    CHECK_EQ(static_cast<uint16_t>(string[index]), s->Get(shape, index));  }
+  CHECK_EQ(static_cast<int>(strlen(string)), s->length());
+  for (int index = 0; index < s->length(); index++) {
+    CHECK_EQ(static_cast<uint16_t>(string[index]), s->Get(index));  }
 }
 
 
 TEST(String) {
   InitializeVM();
 
   VerifyStringAllocation("a");
   VerifyStringAllocation("ab");
   VerifyStringAllocation("abc");
   VerifyStringAllocation("abcd");
@@ skipping 506 matching lines @@
   objs[next_objs_index++] =
       Factory::NewStringFromAscii(CStrVector(str), TENURED);
   delete[] str;
 
   // Add a Map object to look for.
   objs[next_objs_index++] = Handle<Map>(HeapObject::cast(*objs[0])->map());
 
   CHECK_EQ(objs_count, next_objs_index);
   CHECK_EQ(objs_count, ObjectsFoundInHeap(objs, objs_count));
 }