Cleanup ScopeInfo and SerializedScopeInfo.

src/profile-generator.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 2046 matching lines @@
   }
 }
 
 
 void V8HeapExplorer::ExtractClosureReferences(JSObject* js_obj,
                                               HeapEntry* entry) {
   if (js_obj->IsJSFunction()) {
     HandleScope hs;
     JSFunction* func = JSFunction::cast(js_obj);
     Context* context = func->context();
-    ZoneScope zscope(Isolate::Current(), DELETE_ON_EXIT);
-    SerializedScopeInfo* serialized_scope_info =
-        context->closure()->shared()->scope_info();
-    ScopeInfo<ZoneListAllocationPolicy> zone_scope_info(serialized_scope_info);
-    int locals_number = zone_scope_info.NumberOfLocals();
-    for (int i = 0; i < locals_number; ++i) {
-      String* local_name = *zone_scope_info.LocalName(i);
-      int idx = serialized_scope_info->ContextSlotIndex(local_name, NULL);
-      if (idx >= 0 && idx < context->length()) {
-        SetClosureReference(js_obj, entry, local_name, context->get(idx));
-      }
+    ScopeInfo* scope_info = context->closure()->shared()->scope_info();
+
+    // Add context allocated locals.
+    int context_locals = scope_info->num_context_locals();
+    for (int i = 0; i < context_locals; ++i) {
+      String* local_name = *scope_info->context_local_name(i);

[Kevin Millikin (Chromium), 2011/11/02 16:31:19]

Not your code, but while you're cleaning this up I wonder if we should change
the API of the ScopeInfo so that it doesn't use handles.

I don't like handle scopes in raw pointer code if we can avoid them.  From a
quick inspection, it seems like almost all of the callers of local_name,
function_name, etc. just dereference the newly-created handle immediately.

If that's so, it's way, way better to have a raw pointer return type and make
the handful of callers that want a handle have to create one.

Then we can probably get rid of some silly handle scopes, like the one in this
function.

[Steven, 2011/11/02 18:52:59]

Done. However AFAICS this is the only HandleScope that can be removed. But you
might want to check as well.
On 2011/11/02 16:31:19, Kevin Millikin wrote:

+      int idx = Context::MIN_CONTEXT_SLOTS + i;
+      SetClosureReference(js_obj, entry, local_name, context->get(idx));
+    }
+
+    // Add function variable.
+    if (scope_info->HasFunctionName()) {
+      String* name = *scope_info->function_name();
+      int idx = Context::MIN_CONTEXT_SLOTS + context_locals;
+      ASSERT(idx == scope_info->FunctionContextSlotIndex(name, NULL));
+      SetClosureReference(js_obj, entry, name, context->get(idx));
     }
   }
 }
 
 
 void V8HeapExplorer::ExtractPropertyReferences(JSObject* js_obj,
                                                HeapEntry* entry) {
   if (js_obj->HasFastProperties()) {
     DescriptorArray* descs = js_obj->map()->instance_descriptors();
     for (int i = 0; i < descs->number_of_descriptors(); i++) {
@@ skipping 1312 matching lines @@
 
 
 void HeapSnapshotJSONSerializer::SortHashMap(
     HashMap* map, List<HashMap::Entry*>* sorted_entries) {
   for (HashMap::Entry* p = map->Start(); p != NULL; p = map->Next(p))
     sorted_entries->Add(p);
   sorted_entries->Sort(SortUsingEntryValue);
 }
 
 } }  // namespace v8::internal