Merge arguments branch to bleeding edge (second try).

src/heap-profiler.h

Index: src/heap-profiler.h
diff --git a/src/heap-profiler.h b/src/heap-profiler.h
index c1e93c09caabde6f22c994676a836a1d31d921ce..858c5f2f6733d6bf5365176d5241f60f67f0bb58 100644
--- a/src/heap-profiler.h
+++ b/src/heap-profiler.h
@@ -159,9 +159,9 @@ class JSObjectsCluster BASE_EMBEDDED {
     // Their actual value is irrelevant for us.
     switch (special) {
       case ROOTS: return HEAP->result_symbol();
-      case GLOBAL_PROPERTY: return HEAP->code_symbol();
-      case CODE: return HEAP->arguments_shadow_symbol();
-      case SELF: return HEAP->catch_var_symbol();
+      case GLOBAL_PROPERTY: return HEAP->catch_var_symbol();
+      case CODE: return HEAP->code_symbol();
+      case SELF: return HEAP->this_symbol();
       default:
         UNREACHABLE();
         return NULL;