meta: merge node/master into node-chakracore/master

Merge 5156342 as of 2018-02-17
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Kyle Farnung <[email protected]>

.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

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

benchmark/fs/bench-stat-promise.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../common');
-const fs = require('fs');
+const fsPromises = require('fs/promises');
 
 const bench = common.createBenchmark(main, {
   n: [20e4],
@@ -10,11 +10,11 @@ const bench = common.createBenchmark(main, {
 
 async function run(n, statType) {
   const arg = statType === 'fstat' ?
-    await fs.promises.open(__filename, 'r') : __filename;
+    await fsPromises.open(__filename, 'r') : __filename;
   let remaining = n;
   bench.start();
   while (remaining-- > 0)
-    await fs.promises[statType](arg);
+    await fsPromises[statType](arg);
   bench.end(n);
 
   if (typeof arg.close === 'function')

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, {

deps/chakrashim/include/v8-version.h

@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 6
 #define V8_MINOR_VERSION 4
 #define V8_BUILD_NUMBER 388
-#define V8_PATCH_LEVEL 44
+#define V8_PATCH_LEVEL 46
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

deps/v8/gypfiles/gyp_v8

@@ -108,19 +108,14 @@ def run_gyp(args):
 if __name__ == '__main__':
   args = sys.argv[1:]
 
-  gyp_chromium_no_action = os.environ.get('GYP_CHROMIUM_NO_ACTION')
-  if gyp_chromium_no_action == '1':
-    print 'Skipping gyp_v8 due to GYP_CHROMIUM_NO_ACTION env var.'
+  gyp_chromium_no_action = os.environ.get('GYP_CHROMIUM_NO_ACTION', '1')
+  if gyp_chromium_no_action != '0':
+    print 'GYP is now disabled by default.\n'
+    print 'If you really want to run this, set the environment variable '
+    print 'GYP_CHROMIUM_NO_ACTION=0.'
     sys.exit(0)
 
   running_as_hook = '--running-as-hook'
-  if running_as_hook in args and gyp_chromium_no_action != '0':
-    print 'GYP is now disabled by default in runhooks.\n'
-    print 'If you really want to run this, either run '
-    print '`python gypfiles/gyp_v8` explicitly by hand '
-    print 'or set the environment variable GYP_CHROMIUM_NO_ACTION=0.'
-    sys.exit(0)
-
   if running_as_hook in args:
     args.remove(running_as_hook)
 

deps/v8/include/v8-version.h

@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 6
 #define V8_MINOR_VERSION 4
 #define V8_BUILD_NUMBER 388
-#define V8_PATCH_LEVEL 44
+#define V8_PATCH_LEVEL 46
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/heap/spaces.cc

@@ -351,8 +351,8 @@ void MemoryAllocator::Unmapper::WaitUntilCompleted() {
         CancelableTaskManager::kTaskAborted) {
       pending_unmapping_tasks_semaphore_.Wait();
     }
-    concurrent_unmapping_tasks_active_ = 0;
   }
+  concurrent_unmapping_tasks_active_ = 0;
 }
 
 template <MemoryAllocator::Unmapper::FreeMode mode>

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/child_process.md

@@ -621,6 +621,10 @@ pipes between the parent and child. The value is one of the following:
    will enable [`process.send()`][], [`process.disconnect()`][],
    [`process.on('disconnect')`][], and [`process.on('message')`] within the
    child.
+
+   Accessing the IPC channel fd in any way other than [`process.send()`][]
+   or using the IPC channel with a child process that is not a Node.js instance
+   is not supported.
 3. `'ignore'` - Instructs Node.js to ignore the fd in the child. While Node.js
    will always open fds 0 - 2 for the processes it spawns, setting the fd to
    `'ignore'` will cause Node.js to open `/dev/null` and attach it to the