next: Upgrade V8 to 4.3.61.17

.gitignore

@@ -76,3 +76,7 @@ deps/zlib/zlib.target.mk
 tools/faketime
 icu_config.gypi
 test.tap
+
+# Xcode workspaces and project folders
+*.xcodeproj
+*.xcworkspace

.mailmap

@@ -92,6 +92,7 @@ Ray Morgan <[email protected]>
 Ray Solomon <[email protected]>
 Raymond Feng <[email protected]> <[email protected]>
 Rick Olson <[email protected]>
+Roman Klauke <[email protected]> <[email protected]>
 Roman Reiss <[email protected]>
 Ryan Dahl <[email protected]>
 Ryan Emery <[email protected]>

AUTHORS

@@ -576,7 +576,7 @@ Rohini Harendra <[email protected]>
 Chris Barber <[email protected]>
 Michael Kebe <[email protected]>
 Nick Muerdter <[email protected]>
-Roman Klauke <[email protected].com>
+Roman Klauke <romaaan.git@gmail.com>
 Xavi Magrinyà <[email protected]>
 Euan <[email protected]>
 Ed Morley <[email protected]>
@@ -744,5 +744,12 @@ Giovanny Andres Gongora Granada <[email protected]>
 Jeffrey Jagoda <[email protected]>
 Kelsey Breseman <[email protected]>
 Peter Petrov <[email protected]>
+Andrew Crites <[email protected]>
+Marat Abdullin <[email protected]>
+Dan Varga <[email protected]>
+Nick Raienko <[email protected]>
+Guilherme Souza <[email protected]>
+Chris Yip <[email protected]>
+Christopher Monsanto <[email protected]>
 
 # Generated by tools/update-authors.sh

COLLABORATOR_GUIDE.md

@@ -119,14 +119,14 @@ $ git rebase --abort
 Checkout proper target branch
 
 ```text
-$ git checkout v1.x
+$ git checkout master
 ```
 
 Update the tree
 
 ```text
 $ git fetch origin
-$ git merge --ff-only origin/v1.x
+$ git merge --ff-only origin/master
 ```
 
 Apply external patches
@@ -138,21 +138,21 @@ $ curl -L https://github.com/iojs/io.js/pull/xxx.patch | git am --whitespace=fix
 Check and re-review the changes
 
 ```text
-$ git diff origin/v1.x
+$ git diff origin/master
 ```
 
 Check number of commits and commit messages
 
 ```text
-$ git log origin/v1.x...v1.x
+$ git log origin/master...master
 ```
 
 If there are multiple commits that relate to the same feature or
 one with a feature and separate with a test for that feature -
 you'll need to squash them (or strictly speaking `fixup`).
 
 ```text
-$ git rebase -i origin/v1.x
+$ git rebase -i origin/master
 ```
 
 This will open a screen like this (in the default shell editor):
@@ -210,5 +210,16 @@ line.
 Time to push it:
 
 ```text
-$ git push origin v1.x
+$ git push origin master
 ```
+
+### I just made a mistake
+
+With git, there's a way to override remote trees by force pushing
+(`git push -f`). This should generally be seen as forbidden (since
+you're rewriting history on a repository other people are working
+against) but is allowed for simpler slip-ups such as typos in commit
+messages. However, you are only allowed to force push to any io.js
+branch within 10 minutes from your original push. If someone else
+pushes to the branch your commit lives in or the 10 minute period
+passes, consider the commit final.

CONTRIBUTING.md

@@ -34,13 +34,8 @@ $ git remote add upstream git://github.com/iojs/io.js.git
 
 #### Which branch?
 
-Now decide if you want your feature or bug fix to go into the master branch
-or the stable branch.  As a rule of thumb, bug fixes go into the stable branch
-while new features go into the master branch.
-
-The stable branch is effectively frozen; patches that change the io.js
-API/ABI or affect the run-time behavior of applications get rejected. The
-current stable branch is set as the default branch on GitHub.
+For developing new features and bug fixes, the `master` branch should be pulled
+and built upon.
 
 #### Respect the stability index
 
@@ -49,7 +44,7 @@ The rules for the master branch are less strict; consult the
 
 In a nutshell, modules are at varying levels of API stability.  Bug fixes are
 always welcome but API or behavioral changes to modules at stability level 3
-and up are off-limits.
+(Locked) are off-limits.
 
 #### Dependencies
 
@@ -71,12 +66,9 @@ does not align with the project team.
 Create a feature branch and start hacking:
 
 ```text
-$ git checkout -b my-feature-branch -t origin/v1.x
+$ git checkout -b my-feature-branch -t origin/master
 ```
 
-(Where `v1.x` is the latest stable branch as of this writing.)
-
-
 ### Step 3: Commit
 
 Make sure git knows your name and email address:
@@ -123,7 +115,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
 
 ```text
 $ git fetch upstream
-$ git rebase upstream/v1.x  # or upstream/master
+$ git rebase upstream/master
 ```
 
 
@@ -147,10 +139,10 @@ can use this syntax to run it exactly as the test harness would:
 $ python tools/test.py -v --mode=release parallel/test-stream2-transform
 ```
 
-You can run tests directly with node:
+You can run tests directly with iojs:
 
 ```text
-$ node ./test/parallel/test-streams2-transform.js
+$ iojs ./test/parallel/test-streams2-transform.js
 ```
 
 

Makefile

@@ -112,7 +112,9 @@ test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
 test-ci:
-	$(PYTHON) tools/test.py -p tap --logfile test.tap -J parallel sequential message
+	$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release message parallel sequential
+	$(MAKE) jslint
+	$(MAKE) cpplint
 
 test-release: test-build
 	$(PYTHON) tools/test.py --mode=release
@@ -223,6 +225,7 @@ TARBALL=$(TARNAME).tar
 BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
 BINARYTAR=$(BINARYNAME).tar
 XZ=$(shell which xz > /dev/null 2>&1; echo $$?)
+XZ_COMPRESSION ?= 9
 PKG=out/$(TARNAME).pkg
 PACKAGEMAKER ?= /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
 
@@ -296,7 +299,7 @@ $(TARBALL): release-only $(NODE_EXE) doc
 	rm -rf $(TARNAME)
 	gzip -c -f -9 $(TARNAME).tar > $(TARNAME).tar.gz
 ifeq ($(XZ), 0)
-	xz -c -f -9 $(TARNAME).tar > $(TARNAME).tar.xz
+	xz -c -f -$(XZ_COMPRESSION) $(TARNAME).tar > $(TARNAME).tar.xz
 endif
 	rm $(TARNAME).tar
 
@@ -314,7 +317,7 @@ $(BINARYTAR): release-only
 	rm -rf $(BINARYNAME)
 	gzip -c -f -9 $(BINARYNAME).tar > $(BINARYNAME).tar.gz
 ifeq ($(XZ), 0)
-	xz -c -f -9 $(BINARYNAME).tar > $(BINARYNAME).tar.xz
+	xz -c -f -$(XZ_COMPRESSION) $(BINARYNAME).tar > $(BINARYNAME).tar.xz
 endif
 	rm $(BINARYNAME).tar
 

README.md

@@ -276,11 +276,11 @@ information about the governance of the io.js project, see
   - Release GPG key: 9554F04D7259F04124DE6B476D5A82AC7E37093B
 * **Colin Ihrig** ([@cjihrig](https://github.com/cjihrig)) <[email protected]>
 * **Mikeal Rogers** ([@mikeal](https://github.com/mikeal)) <[email protected]>
-* **Rod Vagg** ([@rvagg](https://github.com/rvagg)) <[email protected]>
+* **Rod Vagg** ([@rvagg](https://github.com/rvagg)) <[email protected]> (Technical Committee)
   - Release GPG key: DD8F2338BAE7501E3DD5AC78C273792F7D83545D
 * **Thorsten Lorenz** ([@thlorenz](https://github.com/thlorenz)) <[email protected]>
 * **Stephen Belanger** ([@qard](https://github.com/qard)) <[email protected]>
-* **Jeremiah Senkpiel** ([@fishrock123](https://github.com/fishrock123)) <[email protected]>
+* **Jeremiah Senkpiel** ([@fishrock123](https://github.com/fishrock123)) <[email protected]> (Technical Committee)
   - Release GPG key: FD3A5288F042B6850C66B31F09FE44734EB7990E
 * **Evan Lucas** ([@evanlucas](https://github.com/evanlucas)) <[email protected]>
 * **Brendan Ashworth** ([@brendanashworth](https://github.com/brendanashworth)) <[email protected]>

WORKING_GROUPS.md

@@ -1,7 +1,7 @@
 # io.js Working Groups
 
 io.js Working Groups are autonomous projects created by the
-[Technical Committee (TC)](https://github.com/iojs/io.js/blob/v1.x/GOVERNANCE.md#technical-committee).
+[Technical Committee (TC)](https://github.com/iojs/io.js/blob/master/GOVERNANCE.md#technical-committee).
 
 Working Groups can be formed at any time but must be ratified by the TC.
 Once formed the work defined in the Working Group charter is the
@@ -26,6 +26,7 @@ back in to the TC.
 * [Evangelism](#evangelism)
 * [Roadmap](#roadmap)
 * [Docker](#docker)
+* [Addon API](#addon-api)
 * [Starting a Working Group](#starting-a-wg)
 * [Bootstrap Governance](#bootstrap-governance)
 
@@ -179,6 +180,31 @@ Their responsibilities are:
 * Maintain and improve the images' documentation.
 
 
+### [Addon API](https://github.com/iojs/nan)
+
+The Addon API Working Group is responsible for maintaining the NAN project and
+corresponding _nan_ package in npm. The NAN project makes available an
+abstraction layer for native add-on authors for both Node.js and io.js,
+assisting in the writing of code that is compatible with many actively used
+versions of Node.js, io.js, V8 and libuv.
+
+Their responsibilities are:
+
+* Maintaining the [NAN](https://github.com/iojs/nan) GitHub repository,
+  including code, issues and documentation.
+* Maintaining the [addon-examples](https://github.com/iojs/node-addon-examples)
+  GitHub repository, including code, issues and documentation.
+* Maintaining the C++ Addon API within the io.js project, in subordination to
+  the io.js TC.
+* Maintaining the Addon documentation within the io.js project, in
+  subordination to the io.js TC.
+* Maintaining the _nan_ package in npm, releasing new versions as appropriate.
+* Messaging about the future of the io.js and NAN interface to give the
+  community advance notice of changes.
+
+The current members can be found in their
+[README](https://github.com/iojs/nan#collaborators).
+
 ## Starting a WG
 
 A Working Group is established by first defining a charter  that can be

benchmark/misc/next-tick-breadth-args.js

@@ -0,0 +1,37 @@
+'use strict';
+
+var common = require('../common.js');
+var bench = common.createBenchmark(main, {
+  millions: [2]
+});
+
+function main(conf) {
+  var N = +conf.millions * 1e6;
+  var n = 0;
+
+  function cb1(arg1) {
+    n++;
+    if (n === N)
+      bench.end(n / 1e6);
+  }
+  function cb2(arg1, arg2) {
+    n++;
+    if (n === N)
+      bench.end(n / 1e6);
+  }
+  function cb3(arg1, arg2, arg3) {
+    n++;
+    if (n === N)
+      bench.end(n / 1e6);
+  }
+
+  bench.start();
+  for (var i = 0; i < N; i++) {
+    if (i % 3 === 0)
+      process.nextTick(cb3, 512, true, null);
+    else if (i % 2 === 0)
+      process.nextTick(cb2, false, 5.1);
+    else
+      process.nextTick(cb1, 0);
+  }
+}

benchmark/misc/next-tick-depth-args.js

@@ -0,0 +1,48 @@
+'use strict';
+
+var common = require('../common.js');
+var bench = common.createBenchmark(main, {
+  millions: [2]
+});
+
+process.maxTickDepth = Infinity;
+
+function main(conf) {
+  var n = +conf.millions * 1e6;
+
+  function cb3(arg1, arg2, arg3) {
+    if (--n) {
+      if (n % 3 === 0)
+        process.nextTick(cb3, 512, true, null);
+      else if (n % 2 === 0)
+        process.nextTick(cb2, false, 5.1);
+      else
+        process.nextTick(cb1, 0);
+    } else
+      bench.end(+conf.millions);
+  }
+  function cb2(arg1, arg2) {
+    if (--n) {
+      if (n % 3 === 0)
+        process.nextTick(cb3, 512, true, null);
+      else if (n % 2 === 0)
+        process.nextTick(cb2, false, 5.1);
+      else
+        process.nextTick(cb1, 0);
+    } else
+      bench.end(+conf.millions);
+  }
+  function cb1(arg1) {
+    if (--n) {
+      if (n % 3 === 0)
+        process.nextTick(cb3, 512, true, null);
+      else if (n % 2 === 0)
+        process.nextTick(cb2, false, 5.1);
+      else
+        process.nextTick(cb1, 0);
+    } else
+      bench.end(+conf.millions);
+  }
+  bench.start();
+  process.nextTick(cb1, true);
+}