[ast] Annotate CallRuntime ast node

src/ast/ast.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_AST_AST_H_
 #define V8_AST_AST_H_
 
 #include "src/ast/ast-types.h"
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/modules.h"
 #include "src/ast/variables.h"
 #include "src/bailout-reason.h"
 #include "src/base/flags.h"
 #include "src/factory.h"
 #include "src/globals.h"
 #include "src/isolate.h"
 #include "src/label.h"
 #include "src/list.h"
 #include "src/parsing/token.h"
 #include "src/runtime/runtime.h"
 #include "src/small-pointer-list.h"
-#include "src/utils.h"
 
 namespace v8 {
 namespace internal {
 
 // The abstract syntax tree is an intermediate, light-weight
 // representation of the parsed JavaScript code suitable for
 // compilation to native code.
 
 // Nodes are allocated in a separate zone, which allows faster
 // allocation and constant-time deallocation of the entire syntax
@@ skipping 72 matching lines @@
   V(EmptyParentheses)           \
   V(GetIterator)                \
   V(DoExpression)               \
   V(RewritableExpression)
 
 #define AST_NODE_LIST(V)                        \
   DECLARATION_NODE_LIST(V)                      \
   STATEMENT_NODE_LIST(V)                        \
   EXPRESSION_NODE_LIST(V)
 
+#ifdef DEBUG
+static const char* NameForNativeContextIntrinsicIndex(uint32_t idx) {

[adamk, 2017/01/25 20:26:43]

Rather than copying this, what about exposing it in contexts.h? If we go that
route, I'd also suggest moving the implementation of CallRuntime::debug_name
into ast.cc.

[gsathya, 2017/01/25 21:05:19]

Why is moving to contexts.h better?

[adamk, 2017/01/25 21:11:17]

I'd rather not have two copies of this function. Maybe I misunderstood the
reason for putting this here: is this not exactly the same as what's in caitp's
patch?

[gsathya, 2017/01/25 21:17:17]

It's not exactly the same. As mentioned in my previous comment, caitp's version
uses only a subset of the native context fields (only the intrinsics). It's fine
to merge them though. Also as mentioned in my previous comment, what about the
#ifdef DEBUG? I dont see why we need this for release builds. I can't reuse this
in the test if it's debug only.

[adamk, 2017/01/25 23:13:58]

Sorry, missed the details of the macros. I'm ok with the duplication now, but
I'd prefer if this code lived in ast.cc (just to keep implementation details
hidden).

[gsathya, 2017/01/25 23:27:25]

Done.

+  switch (idx) {
+#define NATIVE_CONTEXT_FIELDS_IDX(NAME, Type, name) \
+  case Context::NAME:                               \
+    return #name;
+
+    NATIVE_CONTEXT_FIELDS(NATIVE_CONTEXT_FIELDS_IDX)
+
+    default:
+      break;
+  }
+
+  return "UnknownIntrinsicIndex";
+}
+#endif  // DEBUG
+
 // Forward declarations
 class AstNodeFactory;
 class Declaration;
 class Module;
 class BreakableStatement;
 class Expression;
 class IterationStatement;
 class MaterializedLiteral;
 class Statement;
 class TypeFeedbackOracle;
@@ skipping 1925 matching lines @@
   }
   const Runtime::Function* function() const {
     DCHECK(!is_jsruntime());
     return function_;
   }
 
   static int num_ids() { return parent_num_ids() + 1; }
   BailoutId CallId() { return BailoutId(local_id(0)); }
 
   const char* debug_name() {
+#ifdef DEBUG
+    return NameForNativeContextIntrinsicIndex(context_index_);
+#else
     return is_jsruntime() ? "(context function)" : function_->name;
+#endif  // DEBUG
   }
 
  private:
   friend class AstNodeFactory;
 
   CallRuntime(const Runtime::Function* function,
               ZoneList<Expression*>* arguments, int pos)
       : Expression(pos, kCallRuntime),
         function_(function),
         arguments_(arguments) {}
@@ skipping 1585 matching lines @@
                                     : NULL;                                   \
   }
 AST_NODE_LIST(DECLARE_NODE_FUNCTIONS)
 #undef DECLARE_NODE_FUNCTIONS
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_AST_AST_H_