Experimental parser: merge r19949

src/objects-printer.cc

 // Copyright 2012 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 360 matching lines @@
     PRINT_ELEMENTS(INT32_ELEMENTS, FixedInt32Array)
     PRINT_DOUBLE_ELEMENTS(FLOAT32_ELEMENTS, FixedFloat32Array)
     PRINT_DOUBLE_ELEMENTS(FLOAT64_ELEMENTS, FixedFloat64Array)
 
 #undef PRINT_DOUBLE_ELEMENTS
 #undef PRINT_ELEMENTS
 
     case DICTIONARY_ELEMENTS:
       elements()->Print(out);
       break;
-    case NON_STRICT_ARGUMENTS_ELEMENTS: {
+    case SLOPPY_ARGUMENTS_ELEMENTS: {
       FixedArray* p = FixedArray::cast(elements());
       PrintF(out, "   parameter map:");
       for (int i = 2; i < p->length(); i++) {
         PrintF(out, " %d:", i - 2);
         p->get(i)->ShortPrint(out);
       }
       PrintF(out, "\n   context: ");
       p->get(0)->ShortPrint(out);
       PrintF(out, "\n   arguments: ");
       p->get(1)->ShortPrint(out);
@@ skipping 167 matching lines @@
   HeapObject::PrintHeader(out, "PolymorphicCodeCache");
   PrintF(out, "\n - cache: ");
   cache()->ShortPrint(out);
 }
 
 
 void TypeFeedbackInfo::TypeFeedbackInfoPrint(FILE* out) {
   HeapObject::PrintHeader(out, "TypeFeedbackInfo");
   PrintF(out, " - ic_total_count: %d, ic_with_type_info_count: %d\n",
          ic_total_count(), ic_with_type_info_count());
-  PrintF(out, " - feedback_vector: ");
-  feedback_vector()->FixedArrayPrint(out);
 }
 
 
 void AliasedArgumentsEntry::AliasedArgumentsEntryPrint(FILE* out) {
   HeapObject::PrintHeader(out, "AliasedArgumentsEntry");
   PrintF(out, "\n - aliased_context_slot: %d", aliased_context_slot());
 }
 
 
 void FixedArray::FixedArrayPrint(FILE* out) {
@@ skipping 18 matching lines @@
     }
   }
   PrintF(out, "\n");
 }
 
 
 void ConstantPoolArray::ConstantPoolArrayPrint(FILE* out) {
   HeapObject::PrintHeader(out, "ConstantPoolArray");
   PrintF(out, " - length: %d", length());
   for (int i = 0; i < length(); i++) {
-    if (i < first_ptr_index()) {
+    if (i < first_code_ptr_index()) {
       PrintF(out, "\n  [%d]: double: %g", i, get_int64_entry_as_double(i));
+    } else if (i < first_heap_ptr_index()) {
+      PrintF(out, "\n  [%d]: code target pointer: %p", i,
+             reinterpret_cast<void*>(get_code_ptr_entry(i)));
     } else if (i < first_int32_index()) {
-      PrintF(out, "\n  [%d]: pointer: %p", i,
-             reinterpret_cast<void*>(get_ptr_entry(i)));
+      PrintF(out, "\n  [%d]: heap pointer: %p", i,
+             reinterpret_cast<void*>(get_heap_ptr_entry(i)));
     } else {
       PrintF(out, "\n  [%d]: int32: %d", i, get_int32_entry(i));
     }
   }
   PrintF(out, "\n");
 }
 
 
 void JSValue::JSValuePrint(FILE* out) {
   HeapObject::PrintHeader(out, "ValueObject");
@@ skipping 247 matching lines @@
   // script()->Print(out);
   PrintF(out, "\n - function token position = %d", function_token_position());
   PrintF(out, "\n - start position = %d", start_position());
   PrintF(out, "\n - end position = %d", end_position());
   PrintF(out, "\n - is expression = %d", is_expression());
   PrintF(out, "\n - debug info = ");
   debug_info()->ShortPrint(out);
   PrintF(out, "\n - length = %d", length());
   PrintF(out, "\n - optimized_code_map = ");
   optimized_code_map()->ShortPrint(out);
+  PrintF(out, "\n - feedback_vector = ");
+  feedback_vector()->FixedArrayPrint(out);
   PrintF(out, "\n");
 }
 
 
 void JSGlobalProxy::JSGlobalProxyPrint(FILE* out) {
   PrintF(out, "global_proxy ");
   JSObjectPrint(out);
   PrintF(out, "native context : ");
   native_context()->ShortPrint(out);
   PrintF(out, "\n");
@@ skipping 249 matching lines @@
   PrintF(out, "\n - name: ");
   name()->ShortPrint(out);
   PrintF(out, "\n - line_offset: ");
   line_offset()->ShortPrint(out);
   PrintF(out, "\n - column_offset: ");
   column_offset()->ShortPrint(out);
   PrintF(out, "\n - type: ");
   type()->ShortPrint(out);
   PrintF(out, "\n - id: ");
   id()->ShortPrint(out);
-  PrintF(out, "\n - data: ");
-  data()->ShortPrint(out);
   PrintF(out, "\n - context data: ");
   context_data()->ShortPrint(out);
   PrintF(out, "\n - wrapper: ");
   wrapper()->ShortPrint(out);
   PrintF(out, "\n - compilation type: %d", compilation_type());
   PrintF(out, "\n - line ends: ");
   line_ends()->ShortPrint(out);
   PrintF(out, "\n - eval from shared: ");
   eval_from_shared()->ShortPrint(out);
   PrintF(out, "\n - eval from instructions offset: ");
@@ skipping 67 matching lines @@
     }
   }
   PrintF(out, "\n");
 }
 
 
 #endif  // OBJECT_PRINT
 
 
 } }  // namespace v8::internal