[v9.x] build: make gyp user defined variables lowercase

.eslintrc.yaml

@@ -47,6 +47,7 @@ rules:
   accessor-pairs: error
   array-callback-return: error
   dot-location: [error, property]
+  dot-notation: error
   eqeqeq: [error, smart]
   no-fallthrough: error
   no-global-assign: error
@@ -74,6 +75,7 @@ rules:
       message: __defineSetter__ is deprecated.
   no-return-await: error
   no-self-assign: error
+  no-self-compare: error
   no-throw-literal: error
   no-unused-labels: error
   no-useless-call: error

GOVERNANCE.md

@@ -38,7 +38,7 @@ responsibility for the change. In the case of pull requests proposed
 by an existing Collaborator, an additional Collaborator is required
 for sign-off.
 
-If one or more Collaborators oppose a proposed change, then the change can not
+If one or more Collaborators oppose a proposed change, then the change cannot
 be accepted unless:
 
 * Discussions and/or additional changes result in no Collaborators objecting to
@@ -73,7 +73,7 @@ may request that the TSC restore them to active status.
 
 ## Technical Steering Committee
 
-A subset of the Collaborators form the Technical Steering Committee (TSC).
+A subset of the Collaborators forms the Technical Steering Committee (TSC).
 The TSC has final authority over this project, including:
 
 * Technical direction

Makefile

@@ -616,7 +616,7 @@ doc-only: $(apidoc_dirs) $(apiassets)  ## Builds the docs with the local or the
 	if [ ! -d doc/api/assets ]; then \
 		$(MAKE) tools/doc/node_modules/js-yaml/package.json; \
 	fi;
-	@$(MAKE) -s $(apidocs_html) $(apidocs_json)
+	@$(MAKE) $(apidocs_html) $(apidocs_json)
 
 .PHONY: doc
 doc: $(NODE_EXE) doc-only

README.md

@@ -246,8 +246,6 @@ For more information about the governance of the Node.js project, see
 **Jeremiah Senkpiel** <fishrock123@rocketmail.com>
 * [gibfahn](https://github.com/gibfahn) -
 **Gibson Fahnestock** <gibfahn@gmail.com> (he/him)
-* [indutny](https://github.com/indutny) -
-**Fedor Indutny** <fedor.indutny@gmail.com>
 * [jasnell](https://github.com/jasnell) -
 **James M Snell** <jasnell@gmail.com> (he/him)
 * [joyeecheung](https://github.com/joyeecheung) -
@@ -277,6 +275,8 @@ For more information about the governance of the Node.js project, see
 **Ben Noordhuis** <info@bnoordhuis.nl>
 * [chrisdickinson](https://github.com/chrisdickinson) -
 **Chris Dickinson** <christopher.s.dickinson@gmail.com>
+* [indutny](https://github.com/indutny) -
+**Fedor Indutny** <fedor.indutny@gmail.com>
 * [isaacs](https://github.com/isaacs) -
 **Isaac Z. Schlueter** <i@izs.me>
 * [joshgav](https://github.com/joshgav) -
@@ -340,6 +340,8 @@ For more information about the governance of the Node.js project, see
 **Daniel Bevenius** <daniel.bevenius@gmail.com>
 * [DavidCai1993](https://github.com/DavidCai1993) -
 **David Cai** <davidcai1993@yahoo.com> (he/him)
+* [devsnek](https://github.com/devsnek) -
+**Gus Caplan** <me@gus.host> (he/him)
 * [edsadr](https://github.com/edsadr) -
 **Adrian Estrada** <edsadr@gmail.com> (he/him)
 * [eljefedelrodeodeljefe](https://github.com/eljefedelrodeodeljefe) -
@@ -424,6 +426,8 @@ For more information about the governance of the Node.js project, see
 **Mikeal Rogers** <mikeal.rogers@gmail.com>
 * [misterdjules](https://github.com/misterdjules) -
 **Julien Gilli** <jgilli@nodejs.org>
+* [mmarchini](https://github.com/mmarchini) -
+**Matheus Marchini** <matheus@sthima.com>
 * [mscdex](https://github.com/mscdex) -
 **Brian White** <mscdex@mscdex.net>
 * [MylesBorins](https://github.com/MylesBorins) -
@@ -510,6 +514,8 @@ For more information about the governance of the Node.js project, see
 **Jeremy Whitlock** <jwhitlock@apache.org>
 * [XadillaX](https://github.com/XadillaX) -
 **Khaidi Chu** <i@2333.moe> (he/him)
+* [yhwang](https://github.com/yhwang) -
+**Yihong Wang** <yh.wang@ibm.com>
 * [yorkie](https://github.com/yorkie) -
 **Yorkie Liu** <yorkiefixer@gmail.com>
 * [yosuke-furukawa](https://github.com/yosuke-furukawa) -

benchmark/compare.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const fork = require('child_process').fork;
+const { fork } = require('child_process');
+const { inspect } = require('util');
 const path = require('path');
 const CLI = require('./_cli.js');
 const BenchmarkProgress = require('./_benchmark_progress.js');
@@ -76,7 +77,7 @@ if (showProgress) {
       // Construct configuration string, " A=a, B=b, ..."
       let conf = '';
       for (const key of Object.keys(data.conf)) {
-        conf += ` ${key}=${JSON.stringify(data.conf[key])}`;
+        conf += ` ${key}=${inspect(data.conf[key])}`;
       }
       conf = conf.slice(1);
       // Escape quotes (") for correct csv formatting

benchmark/http/check_invalid_header_char.js

@@ -3,43 +3,66 @@
 const common = require('../common.js');
 const _checkInvalidHeaderChar = require('_http_common')._checkInvalidHeaderChar;
 
-// Put it here so the benchmark result lines will not be super long.
-const LONG_AND_INVALID = 'Here is a value that is really a folded header ' +
-  'value\r\n  this should be supported, but it is not currently';
+const groupedInputs = {
+  // Representative set of inputs from an AcmeAir benchmark run:
+  // all valid strings, average length 14.4, stdev 13.0
+  group_acmeair: [
+    'W/"2-d4cbb29"', 'OK', 'Express', 'X-HTTP-Method-Override', 'Express',
+    'application/json', 'application/json; charset=utf-8', '206', 'OK',
+    'sessionid=; Path=/', 'text/html; charset=utf-8',
+    'text/html; charset=utf-8', '10', 'W/"a-eda64de5"', 'OK', 'Express',
+    'application/json', 'application/json; charset=utf-8', '2', 'W/"2-d4cbb29"',
+    'OK', 'Express', 'X-HTTP-Method-Override', 'sessionid=; Path=/', 'Express',
+    'sessionid=; Path=/,sessionid=6b059402-d62f-4e6f-b3dd-ce5b9e487c39; Path=/',
+    'text/html; charset=utf-8', 'text/html; charset=utf-8', '9', 'OK',
+    'sessionid=; Path=/', 'text/html; charset=utf-8',
+    'text/html; charset=utf-8', '10', 'W/"a-eda64de5"', 'OK', 'Express',
+    'Express', 'X-HTTP-Method-Override', 'sessionid=; Path=/',
+    'application/json'
+  ],
+
+  // Put it here so the benchmark result lines will not be super long.
+  LONG_AND_INVALID: ['Here is a value that is really a folded header ' +
+    'value\r\n  this should be supported, but it is not currently']
+};
+
+const inputs = [
+  // Valid
+  '',
+  '1',
+  '\t\t\t\t\t\t\t\t\t\tFoo bar baz',
+  'keep-alive',
+  'close',
+  'gzip',
+  '20091',
+  'private',
+  'text/html; charset=utf-8',
+  'text/plain',
+  'Sat, 07 May 2016 16:54:48 GMT',
+  'SAMEORIGIN',
+  'en-US',
+
+  // Invalid
+  '中文呢', // unicode
+  'foo\nbar',
+  '\x7F'
+];
 
 const bench = common.createBenchmark(main, {
-  key: [
-    // Valid
-    '',
-    '1',
-    '\t\t\t\t\t\t\t\t\t\tFoo bar baz',
-    'keep-alive',
-    'close',
-    'gzip',
-    '20091',
-    'private',
-    'text/html; charset=utf-8',
-    'text/plain',
-    'Sat, 07 May 2016 16:54:48 GMT',
-    'SAMEORIGIN',
-    'en-US',
-
-    // Invalid
-    'LONG_AND_INVALID',
-    '中文呢', // unicode
-    'foo\nbar',
-    '\x7F'
-  ],
+  input: inputs.concat(Object.keys(groupedInputs)),
   n: [1e6],
 });
 
-function main({ n, key }) {
-  if (key === 'LONG_AND_INVALID') {
-    key = LONG_AND_INVALID;
+function main({ n, input }) {
+  let inputs = [input];
+  if (groupedInputs.hasOwnProperty(input)) {
+    inputs = groupedInputs[input];
   }
+
+  const len = inputs.length;
   bench.start();
   for (var i = 0; i < n; i++) {
-    _checkInvalidHeaderChar(key);
+    _checkInvalidHeaderChar(inputs[i % len]);
   }
   bench.end(n);
 }

benchmark/misc/object-property-bench.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/* eslint-disable dot-notation */
+
 const common = require('../common.js');
 
 const bench = common.createBenchmark(main, {

common.gypi

@@ -27,7 +27,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.19',
+    'v8_embedder_string': '-node.20',
 
     # Enable disassembler for `--print-code` v8 options
     'v8_enable_disassembler': 1,
@@ -44,29 +44,29 @@
 
     'conditions': [
       ['GENERATOR=="ninja"', {
-        'OBJ_DIR': '<(PRODUCT_DIR)/obj',
-        'V8_BASE': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
+        'obj_dir': '<(PRODUCT_DIR)/obj',
+        'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
        }, {
-         'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
-         'V8_BASE%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
+         'obj_dir%': '<(PRODUCT_DIR)/obj.target',
+         'v8_base%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
       }],
       ['OS == "win"', {
         'os_posix': 0,
         'v8_postmortem_support%': 'false',
-        'OBJ_DIR': '<(PRODUCT_DIR)/obj',
-        'V8_BASE': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
+        'obj_dir': '<(PRODUCT_DIR)/obj',
+        'v8_base': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
       }, {
         'os_posix': 1,
         'v8_postmortem_support%': 'true',
       }],
       ['OS== "mac"', {
-        'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
-        'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
+        'obj_dir%': '<(PRODUCT_DIR)/obj.target',
+        'v8_base': '<(PRODUCT_DIR)/libv8_base.a',
       }],
       ['openssl_fips != ""', {
-        'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
+        'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
       }, {
-        'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
+        'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
       }],
       ['OS=="mac"', {
         'clang%': 1,

deps/v8/src/profiler/profiler-listener.cc

@@ -226,11 +226,18 @@ void ProfilerListener::RecordInliningInfo(CodeEntry* entry,
       SharedFunctionInfo* shared_info = SharedFunctionInfo::cast(
           deopt_input_data->LiteralArray()->get(shared_info_id));
       if (!depth++) continue;  // Skip the current function itself.
-      CodeEntry* inline_entry = new CodeEntry(
-          entry->tag(), GetFunctionName(shared_info->DebugName()),
-          CodeEntry::kEmptyNamePrefix, entry->resource_name(),
-          CpuProfileNode::kNoLineNumberInfo,
-          CpuProfileNode::kNoColumnNumberInfo, NULL, code->instruction_start());
+      const char* resource_name =
+          (shared_info->script()->IsScript() &&
+           Script::cast(shared_info->script())->name()->IsName())
+              ? GetName(Name::cast(Script::cast(shared_info->script())->name()))
+              : CodeEntry::kEmptyResourceName;
+
+      CodeEntry* inline_entry =
+          new CodeEntry(entry->tag(), GetFunctionName(shared_info->DebugName()),
+                        CodeEntry::kEmptyNamePrefix, resource_name,
+                        CpuProfileNode::kNoLineNumberInfo,
+                        CpuProfileNode::kNoColumnNumberInfo, nullptr,
+                        code->instruction_start());
       inline_entry->FillFunctionInfo(shared_info);
       inline_stack.push_back(inline_entry);
     }

deps/v8/test/cctest/test-cpu-profiler.cc

@@ -1745,6 +1745,85 @@ TEST(FunctionDetails) {
                        script_a->GetUnboundScript()->GetId(), 5, 14);
 }
 
+TEST(FunctionDetailsInlining) {
+  if (!CcTest::i_isolate()->use_optimizer() || i::FLAG_always_opt) return;
+  i::FLAG_allow_natives_syntax = true;
+  v8::HandleScope scope(CcTest::isolate());
+  v8::Local<v8::Context> env = CcTest::NewContext(PROFILER_EXTENSION);
+  v8::Context::Scope context_scope(env);
+  ProfilerHelper helper(env);
+
+  // alpha is in a_script, beta in b_script. beta is
+  // inlined in alpha, but it should be attributed to b_script.
+
+  v8::Local<v8::Script> script_b = CompileWithOrigin(
+      "function beta(k) {\n"
+      "  let sum = 2;\n"
+      "  for(let i = 0; i < k; i ++) {\n"
+      "    sum += i;\n"
+      "    sum = sum + 'a';\n"
+      "  }\n"
+      "  return sum;\n"
+      "}\n"
+      "\n",
+      "script_b");
+
+  v8::Local<v8::Script> script_a = CompileWithOrigin(
+      "function alpha(p) {\n"
+      "  let res = beta(p);\n"
+      "  res = res + res;\n"
+      "  return res;\n"
+      "}\n"
+      "let p = 2;\n"
+      "\n"
+      "\n"
+      "// Warm up before profiling or the inlining doesn't happen.\n"
+      "p = alpha(p);\n"
+      "p = alpha(p);\n"
+      "%OptimizeFunctionOnNextCall(alpha);\n"
+      "p = alpha(p);\n"
+      "\n"
+      "\n"
+      "startProfiling();\n"
+      "for(let i = 0; i < 10000; i++) {\n"
+      "  p = alpha(p);\n"
+      "}\n"
+      "stopProfiling();\n"
+      "\n"
+      "\n",
+      "script_a");
+
+  script_b->Run(env).ToLocalChecked();
+  script_a->Run(env).ToLocalChecked();
+
+  const v8::CpuProfile* profile = i::ProfilerExtension::last_profile;
+  const v8::CpuProfileNode* current = profile->GetTopDownRoot();
+  reinterpret_cast<ProfileNode*>(const_cast<v8::CpuProfileNode*>(current))
+      ->Print(0);
+  //   The tree should look like this:
+  //  0  (root) 0 #1
+  //  5    (program) 0 #6
+  //  2     14 #2 script_a:1
+  //    ;;; deopted at script_id: 14 position: 299 with reason 'Insufficient
+  //    type feedback for call'.
+  //  1      alpha 14 #4 script_a:1
+  //  9        beta 13 #5 script_b:0
+  //  0      startProfiling 0 #3
+
+  const v8::CpuProfileNode* root = profile->GetTopDownRoot();
+  const v8::CpuProfileNode* script = GetChild(env, root, "");
+  CheckFunctionDetails(env->GetIsolate(), script, "", "script_a",
+                       script_a->GetUnboundScript()->GetId(), 1, 1);
+  const v8::CpuProfileNode* alpha = FindChild(env, script, "alpha");
+  // Return early if profiling didn't sample alpha.
+  if (!alpha) return;
+  CheckFunctionDetails(env->GetIsolate(), alpha, "alpha", "script_a",
+                       script_a->GetUnboundScript()->GetId(), 1, 15);
+  const v8::CpuProfileNode* beta = FindChild(env, alpha, "beta");
+  if (!beta) return;
+  CheckFunctionDetails(env->GetIsolate(), beta, "beta", "script_b",
+                       script_b->GetUnboundScript()->GetId(), 0, 0);
+}
 
 TEST(DontStopOnFinishedProfileDelete) {
   v8::HandleScope scope(CcTest::isolate());

doc/.eslintrc.yaml

@@ -12,3 +12,6 @@ rules:
   no-var: error
   prefer-const: error
   prefer-rest-params: error
+
+  # Stylistic Issues
+  no-multiple-empty-lines: [error, {max: 1, maxEOF: 0, maxBOF: 0}]

doc/api/assert.md

@@ -113,7 +113,9 @@ changes:
     description: Enumerable symbol properties are now compared.
   - version: v9.0.0
     pr-url: https://github.com/nodejs/node/pull/15036
-    description: NaN is now compared using the [SameValueZero][] comparison.
+    description: NaN is now compared using the
+                 [SameValueZero](https://tc39.github.io/ecma262/#sec-samevaluezero)
+                 comparison.
   - version: v8.5.0
     pr-url: https://github.com/nodejs/node/pull/15001
     description: Error names and messages are now properly compared
@@ -461,7 +463,9 @@ changes:
     description: -0 and +0 are not considered equal anymore.
   - version: v9.0.0
     pr-url: https://github.com/nodejs/node/pull/15036
-    description: NaN is now compared using the [SameValueZero][] comparison.
+    description: NaN is now compared using the
+                 [SameValueZero](https://tc39.github.io/ecma262/#sec-samevaluezero)
+                 comparison.
   - version: v9.0.0
     pr-url: https://github.com/nodejs/node/pull/15001
     description: Error names and messages are now properly compared