Merge nodejs/master as of 3/14/2017

CHANGELOG.md

@@ -28,7 +28,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V7.md#7.7.2">7.7.2</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V7.md#7.7.3">7.7.3</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V7.md#7.7.2">7.7.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V7.md#7.7.1">7.7.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V7.md#7.7.0">7.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V7.md#7.6.0">7.6.0</a><br/>

benchmark/buffers/buffer-base64-encode.js

@@ -1,3 +1,24 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 'use strict';
 var common = require('../common.js');
 

benchmark/buffers/buffer-compare.js

@@ -1,3 +1,24 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 'use strict';
 var common = require('../common.js');
 

benchmark/crypto/get-ciphers.js

@@ -18,6 +18,6 @@ function main(conf) {
       method();
   }
   bench.start();
-  for (; i < n; i++) method();
+  for (i = 0; i < n; i++) method();
   bench.end(n);
 }

benchmark/misc/punycode.js

@@ -46,7 +46,7 @@ function runPunycode(n, val) {
   for (; i < n; i++)
     usingPunycode(val);
   bench.start();
-  for (; i < n; i++)
+  for (i = 0; i < n; i++)
     usingPunycode(val);
   bench.end(n);
 }

benchmark/module/module-loader.js

@@ -8,7 +8,8 @@ var benchmarkDirectory = path.join(tmpDirectory, 'nodejs-benchmark-module');
 
 var bench = common.createBenchmark(main, {
   thousands: [50],
-  fullPath: ['true', 'false']
+  fullPath: ['true', 'false'],
+  useCache: ['true', 'false']
 });
 
 function main(conf) {
@@ -31,22 +32,34 @@ function main(conf) {
   }
 
   if (conf.fullPath === 'true')
-    measureFull(n);
+    measureFull(n, conf.useCache === 'true');
   else
-    measureDir(n);
+    measureDir(n, conf.useCache === 'true');
 }
 
-function measureFull(n) {
+function measureFull(n, useCache) {
+  var i;
+  if (useCache) {
+    for (i = 0; i <= n; i++) {
+      require(benchmarkDirectory + i + '/index.js');
+    }
+  }
   bench.start();
-  for (var i = 0; i <= n; i++) {
+  for (i = 0; i <= n; i++) {
     require(benchmarkDirectory + i + '/index.js');
   }
   bench.end(n / 1e3);
 }
 
-function measureDir(n) {
+function measureDir(n, useCache) {
+  var i;
+  if (useCache) {
+    for (i = 0; i <= n; i++) {
+      require(benchmarkDirectory + i);
+    }
+  }
   bench.start();
-  for (var i = 0; i <= n; i++) {
+  for (i = 0; i <= n; i++) {
     require(benchmarkDirectory + i);
   }
   bench.end(n / 1e3);

benchmark/url/legacy-vs-whatwg-url-searchparams-serialize.js

@@ -7,7 +7,7 @@ const inputs = require('../fixtures/url-inputs.js').searchParams;
 const bench = common.createBenchmark(main, {
   type: Object.keys(inputs),
   method: ['legacy', 'whatwg'],
-  n: [1e5]
+  n: [1e6]
 });
 
 function useLegacy(n, input, prop) {

common.gypi

@@ -361,12 +361,12 @@
 	    'ldflags': [ '-m64' ],
 	   }],
           [ 'target_arch=="s390"', {
-            'cflags': [ '-m31' ],
-            'ldflags': [ '-m31' ],
+            'cflags': [ '-m31', '-march=z196' ],
+            'ldflags': [ '-m31', '-march=z196' ],
           }],
           [ 'target_arch=="s390x"', {
-            'cflags': [ '-m64' ],
-            'ldflags': [ '-m64' ],
+            'cflags': [ '-m64', '-march=z196' ],
+            'ldflags': [ '-m64', '-march=z196' ],
           }],
           [ 'OS=="solaris"', {
             'cflags': [ '-pthreads' ],

deps/chakrashim/include/v8-version.h

@@ -34,7 +34,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 6
 #define V8_BUILD_NUMBER 326
-#define V8_PATCH_LEVEL 55
+#define V8_PATCH_LEVEL 56
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)