Fix: FunctionTemplate::SetPrototypeAttributes broke prototype object

src/runtime.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 1942 matching lines @@
   ASSERT(fun->should_have_prototype());
   Object* obj;
   { MaybeObject* maybe_obj =
         Accessors::FunctionSetPrototype(fun, args[1], NULL);
     if (!maybe_obj->ToObject(&obj)) return maybe_obj;
   }
   return args[0];  // return TOS
 }
 
 
+RUNTIME_FUNCTION(MaybeObject*, Runtime_FunctionReadOnlyPrototype) {
+  NoHandleAllocation ha;
+  RUNTIME_ASSERT(args.length() == 1);
+  CONVERT_CHECKED(JSFunction, object, args[0]);

[Rico, 2011/07/25 13:05:42]

it's a function, maybe call it fun, function or f instead of object

[Jakob Kummerow, 2011/07/25 14:57:05]

Done.

+
+  MaybeObject* maybe_name =
+      isolate->heap()->AllocateStringFromAscii(CStrVector("prototype"));
+  String* name;
+  if (!maybe_name->To(&name)) return maybe_name;
+
+  if (object->HasFastProperties()) {

[Rico, 2011/07/25 13:05:42]

If it is not performance critical to keep fast properties consider just
converting to dictionary mode instead of the descriptor array juggling 

[Jakob Kummerow, 2011/07/25 14:57:05]

I'd prefer to keep performance as it is since this code can be called by
embedders at will.

+    // Construct a new field descriptor with updated attributes.
+    DescriptorArray* instance_desc = object->map()->instance_descriptors();
+    int index = instance_desc->Search(name);

[Rico, 2011/07/25 13:05:42]

assert that index != kNotFound

[Jakob Kummerow, 2011/07/25 14:57:05]

Done.

+    PropertyDetails details(instance_desc->GetDetails(index));
+    CallbacksDescriptor new_desc(name,
+        instance_desc->GetValue(index),
+        static_cast<PropertyAttributes>(details.attributes() | READ_ONLY),
+        details.index());
+    // Construct a new field descriptors array containing the new descriptor.
+    Object* descriptors_unchecked;
+    { MaybeObject* maybe_descriptors_unchecked =
+        instance_desc->CopyInsert(&new_desc, REMOVE_TRANSITIONS);
+      if (!maybe_descriptors_unchecked->ToObject(&descriptors_unchecked)) {
+        return maybe_descriptors_unchecked;
+      }
+    }
+    DescriptorArray* new_descriptors =
+        DescriptorArray::cast(descriptors_unchecked);
+    // Create a new map featuring the new field descriptors array.
+    Object* map_unchecked;
+    { MaybeObject* maybe_map_unchecked = object->map()->CopyDropDescriptors();
+      if (!maybe_map_unchecked->ToObject(&map_unchecked)) {
+        return maybe_map_unchecked;
+      }
+    }
+    Map* new_map = Map::cast(map_unchecked);
+    new_map->set_instance_descriptors(new_descriptors);
+    object->set_map(new_map);
+  } else {  // Dictionary properties.
+    // Directly manipulate the property details.
+    int entry = object->property_dictionary()->FindEntry(name);

[Rico, 2011/07/25 13:05:42]

assert that entry != kNotFound

[Jakob Kummerow, 2011/07/25 14:57:05]

Done.

+    PropertyDetails details = object->property_dictionary()->DetailsAt(entry);
+    PropertyDetails new_details(
+        static_cast<PropertyAttributes>(details.attributes() | READ_ONLY),
+        details.type(), details.index());

[Rico, 2011/07/25 13:05:42]

nit, put last argument on seperate line

[Jakob Kummerow, 2011/07/25 14:57:05]

Done.

+    object->property_dictionary()->DetailsAtPut(entry, new_details);
+  }
+  return object;
+}
+
+
 RUNTIME_FUNCTION(MaybeObject*, Runtime_FunctionIsAPIFunction) {
   NoHandleAllocation ha;
   ASSERT(args.length() == 1);
 
   CONVERT_CHECKED(JSFunction, f, args[0]);
   return f->shared()->IsApiFunction() ? isolate->heap()->true_value()
                                       : isolate->heap()->false_value();
 }
 
 
@@ skipping 10697 matching lines @@
   } else {
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     isolate->counters()->gc_last_resort_from_js()->Increment();
     isolate->heap()->CollectAllGarbage(false);
   }
 }
 
 
 } }  // namespace v8::internal