Remove the descriptor stream abstractions....

src/factory.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 552 matching lines @@
     Handle<Object> descriptors) {
   v8::NeanderArray callbacks(descriptors);
   int nof_callbacks = callbacks.length();
   Handle<DescriptorArray> result =
       NewDescriptorArray(array->number_of_descriptors() + nof_callbacks);
 
   // Number of descriptors added to the result so far.
   int descriptor_count = 0;
 
   // Copy the descriptors from the array.
-  {
-    DescriptorWriter w(*result);
-    for (DescriptorReader r(*array); !r.eos(); r.advance()) {
-      if (!r.IsNullDescriptor()) {
-        w.WriteFrom(&r);
-      }
-      descriptor_count++;
+  for (int i = 0; i < array->number_of_descriptors(); i++) {
+    if (array->GetType(i) != NULL_DESCRIPTOR) {
+      result->SetFrom(descriptor_count++, *array, i);

[iposva, 2009/07/10 16:36:15]

This would probably be more readable if SetFrom was renamed to CopyFrom, which
to me indicates that you are copying an entry from one descriptor array to the
target index.

[Mads Ager (chromium), 2009/07/10 19:21:08]

I agree.  Thanks.

     }
   }
 
   // Number of duplicates detected.
   int duplicates = 0;
 
   // Fill in new callback descriptors.  Process the callbacks from
   // back to front so that the last callback with a given name takes
   // precedence over previously added callbacks with that name.
   for (int i = nof_callbacks - 1; i >= 0; i--) {
     Handle<AccessorInfo> entry =
         Handle<AccessorInfo>(AccessorInfo::cast(callbacks.get(i)));
     // Ensure the key is a symbol before writing into the instance descriptor.
     Handle<String> key =
         SymbolFromString(Handle<String>(String::cast(entry->name())));
     // Check if a descriptor with this name already exists before writing.
     if (result->LinearSearch(*key, descriptor_count) ==
         DescriptorArray::kNotFound) {
       CallbacksDescriptor desc(*key, *entry, entry->property_attributes());
       // We do not use a DescriptorWriter because SymbolFromString can

[iposva, 2009/07/10 16:36:15]

The DescriptorWriter comment is now outdated here.

[Mads Ager (chromium), 2009/07/10 19:21:08]

Whoops, done.

       // allocate. A DescriptorWriter holds a raw pointer and is
       // therefore not GC safe.
       result->Set(descriptor_count, &desc);
       descriptor_count++;
     } else {
       duplicates++;
     }
   }
 
   // If duplicates were detected, allocate a result of the right size
   // and transfer the elements.
   if (duplicates > 0) {
+    int number_of_descriptors = result->number_of_descriptors() - duplicates;
     Handle<DescriptorArray> new_result =
-        NewDescriptorArray(result->number_of_descriptors() - duplicates);
-    DescriptorWriter w(*new_result);
-    DescriptorReader r(*result);
-    while (!w.eos()) {
-      w.WriteFrom(&r);
-      r.advance();
+        NewDescriptorArray(number_of_descriptors);
+    for (int i = 0; i < number_of_descriptors; i++) {
+      new_result->SetFrom(i, *result, i);
     }
     result = new_result;
   }
 
   // Sort the result before returning.
   result->Sort();
   return result;
 }
 
 
@@ skipping 295 matching lines @@
     Execution::ConfigureInstance(instance,
                                  instance_template,
                                  pending_exception);
   } else {
     *pending_exception = false;
   }
 }
 
 
 } }  // namespace v8::internal