build: remove (almost) unused macros/constants

Macros, like CHECK, cause issues for tracking coverage because
they modify the source before it's placed in V8. Upon investigation
it seemed that we only used this functionality in two places:
internal/vm/module.js, and internal/async_hooks.js (in comments).
Given this, it seemed to make more sense to move CHECK to
JavaScript, and retire a mostly unused build step.
PR-URL: #30755
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: bcoe

lib/.eslintrc.yaml

@@ -62,21 +62,6 @@ rules:
 node-core/non-ascii-character: error
 globals:
 Intl: false
-# Assertions
-CHECK: false
-CHECK_EQ: false
-CHECK_GE: false
-CHECK_GT: false
-CHECK_LE: false
-CHECK_LT: false
-CHECK_NE: false
-DCHECK: false
-DCHECK_EQ: false
-DCHECK_GE: false
-DCHECK_GT: false
-DCHECK_LE: false
-DCHECK_LT: false
-DCHECK_NE: false
 # Parameters passed to internal modules
 global: false
 require: false

lib/internal/vm/module.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const{ fail }=require('internal/assert');
 const{
  ArrayIsArray,
  ObjectCreate,
@@ -59,6 +60,11 @@ const kContext = Symbol('kContext');
 constkPerContextModuleId=Symbol('kPerContextModuleId');
 constkLink=Symbol('kLink');
 
+functionfailIfDebug(){
+if(process.features.debug===false)return;
+fail('VM Modules');
+}
+
 classModule{
 constructor(options){
 emitExperimentalWarning('VM Modules');
@@ -119,7 +125,7 @@ class Module {
 syntheticExportNames,
 syntheticEvaluationSteps);
 }else{
-CHECK(false);
+failIfDebug();
 }
 
 wrapToModuleMap.set(this[kWrap],this);
@@ -375,7 +381,7 @@ class SyntheticModule extends Module {
  identifier,
 });
 
-this[kLink]=()=>this[kWrap].link(()=>{CHECK(false);});
+this[kLink]=()=>this[kWrap].link(()=>{failIfDebug();});
 }
 
 setExport(name,value){

node.gyp

@@ -899,23 +899,11 @@
 # Put the code first so it's a dependency and can be used for invocation.
 'tools/js2c.py',
 '<@(library_files)',
-'config.gypi',
-'tools/js2c_macros/check_macros.py'
+'config.gypi'
  ],
 'outputs': [
 '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
  ],
-'conditions': [
- [ 'node_use_dtrace=="false" and node_use_etw=="false"', {
-'inputs': [ 'tools/js2c_macros/notrace_macros.py' ]
- }],
- [ 'node_debug_lib=="false"', {
-'inputs': [ 'tools/js2c_macros/nodcheck_macros.py' ]
- }],
- [ 'node_debug_lib=="true"', {
-'inputs': [ 'tools/js2c_macros/dcheck_macros.py' ]
- }]
- ],
 'action': [
 'python', '<@(_inputs)',
 '--target', '<@(_outputs)',

tools/js2c.py

@@ -45,137 +45,6 @@ def ReadFile(filename):
 returnlines
 
 
-defReadMacroFiles(filenames):
-"""
-
- :rtype: List(str)
- """
-result= []
-forfilenameinfilenames:
-withopen(filename, "rt") asf:
-# strip python-like comments and whitespace padding
-lines= [line.split('#')[0].strip() forlineinf]
-# filter empty lines
-result.extend(filter(bool, lines))
-returnresult
-
-
-defExpandConstants(lines, constants):
-forkey, valueinconstants.items():
-lines=lines.replace(key, str(value))
-returnlines
-
-
-defExpandMacros(lines, macros):
-defexpander(s):
-returnExpandMacros(s, macros)
-
-forname, macroinmacros.items():
-name_pattern=re.compile("\\b%s\\("%name)
-pattern_match=name_pattern.search(lines, 0)
-whilepattern_matchisnotNone:
-# Scan over the arguments
-height=1
-start=pattern_match.start()
-end=pattern_match.end()
-assertlines[end-1] =='('
-last_match=end
-arg_index= [0] # Wrap state into array, to work around Python "scoping"
-mapping= {}
-
-defadd_arg(s):
-# Remember to expand recursively in the arguments
-ifarg_index[0] >=len(macro.args):
-return
-replacement=expander(s.strip())
-mapping[macro.args[arg_index[0]]] =replacement
-arg_index[0] +=1
-
-whileend<len(lines) andheight>0:
-# We don't count commas at higher nesting levels.
-iflines[end] ==','andheight==1:
-add_arg(lines[last_match:end])
-last_match=end+1
-eliflines[end] in ['(', '{', '[']:
-height=height+1
-eliflines[end] in [')', '}', ']']:
-height=height-1
-end=end+1
-# Remember to add the last match.
-add_arg(lines[last_match:end-1])
-ifarg_index[0] <len(macro.args) -1:
-lineno=lines.count(os.linesep, 0, start) +1
-raiseException(
-'line %s: Too few arguments for macro "%s"'% (lineno, name))
-result=macro.expand(mapping)
-# Replace the occurrence of the macro with the expansion
-lines=lines[:start] +result+lines[end:]
-pattern_match=name_pattern.search(lines, start+len(result))
-returnlines
-
-
-classTextMacro:
-def__init__(self, args, body):
-self.args=args
-self.body=body
-
-defexpand(self, mapping):
-result=self.body
-forkey, valueinmapping.items():
-result=result.replace(key, value)
-returnresult
-
-
-classPythonMacro:
-def__init__(self, args, fun):
-self.args=args
-self.fun=fun
-
-defexpand(self, mapping):
-args= []
-forarginself.args:
-args.append(mapping[arg])
-returnstr(self.fun(*args))
-
-
-CONST_PATTERN=re.compile('^const\s+([a-zA-Z0-9_]+)\s*=\s*([^;]*);$')
-MACRO_PATTERN=re.compile('^macro\s+([a-zA-Z0-9_]+)\s*\(([^)]*)\)\s*=\s*([^;]*);$')
-PYTHON_MACRO_PATTERN=re.compile('^python\s+macro\s+([a-zA-Z0-9_]+)\s*\(([^)]*)\)\s*=\s*([^;]*);$')
-
-
-defReadMacros(macro_files):
-lines=ReadMacroFiles(macro_files)
-constants= {}
-macros= {}
-forlineinlines:
-line=line.split('#')[0].strip()
-iflen(line) ==0:
-continue
-const_match=CONST_PATTERN.match(line)
-ifconst_match:
-name=const_match.group(1)
-value=const_match.group(2).strip()
-constants[name] =value
-else:
-macro_match=MACRO_PATTERN.match(line)
-ifmacro_match:
-name=macro_match.group(1)
-args= [p.strip() forpinmacro_match.group(2).split(',')]
-body=macro_match.group(3).strip()
-macros[name] =TextMacro(args, body)
-else:
-python_match=PYTHON_MACRO_PATTERN.match(line)
-ifpython_match:
-name=python_match.group(1)
-args= [p.strip() forpinmacro_match.group(2).split(',')]
-body=python_match.group(3).strip()
-fun=eval("lambda "+",".join(args) +': '+body)
-macros[name] =PythonMacro(args, fun)
-else:
-raiseException("Illegal line: "+line)
-returnconstants, macros
-
-
 TEMPLATE="""
 #include "env-inl.h"
 #include "node_native_module.h"
@@ -243,10 +112,8 @@ def GetDefinition(var, source, step=30):
 returndefinition, len(code_points)
 
 
-defAddModule(filename, consts, macros, definitions, initializers):
+defAddModule(filename, definitions, initializers):
 code=ReadFile(filename)
-code=ExpandConstants(code, consts)
-code=ExpandMacros(code, macros)
 name=NormalizeFileName(filename)
 slug=SLUGGER_RE.sub('_', name)
 var=slug+'_raw'
@@ -267,15 +134,12 @@ def NormalizeFileName(filename):
 
 
 defJS2C(source_files, target):
-# Process input from all *macro.py files
-consts, macros=ReadMacros(source_files['.py'])
-
 # Build source code lines
 definitions= []
 initializers= []
 
 forfilenameinsource_files['.js']:
-AddModule(filename, consts, macros, definitions, initializers)
+AddModule(filename, definitions, initializers)
 
 config_def, config_size=handle_config_gypi(source_files['config.gypi'])
 definitions.append(config_def)
@@ -341,8 +205,8 @@ def main():
 globalis_verbose
 is_verbose=options.verbose
 source_files=functools.reduce(SourceFileByExt, options.sources, {})
-# Should have exactly 3 types: `.js`, `.py`, and `.gypi`
-assertlen(source_files) ==3
+# Should have exactly 2 types: `.js`, and `.gypi`
+assertlen(source_files) ==2
 # Currently config.gypi is the only `.gypi` file allowed
 assertsource_files['.gypi'] == ['config.gypi']
 source_files['config.gypi'] =source_files.pop('.gypi')[0]