Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
meta: merge node/master into node-chakracore/master
Browse files Browse the repository at this point in the history
Merge cd174df as of 2017-12-06
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Taylor Woll <[email protected]>
  • Loading branch information
chakrabot committed Jan 17, 2018
2 parents 985faa1 + cd174df commit e104f74
Show file tree
Hide file tree
Showing 1,256 changed files with 68,784 additions and 45,258 deletions.
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ Lydia Kats <[email protected]> Lydia Katsamberis <[email protected]>
Maciej Małecki <[email protected]> <[email protected]>
Malte-Thorben Bruns <[email protected]> <[email protected]>
Malte-Thorben Bruns <[email protected]> skenqbx <[email protected]>
Mandeep Singh <[email protected]> <[email protected]>
Manil Chowdhurian <[email protected]> Chowdhurian <[email protected]>
Marcelo Gobelli <[email protected]> decareano <[email protected]>
Marcin Cieślak <[email protected]>
Expand All @@ -206,6 +207,7 @@ Marcin Zielinski <[email protected]> marzelin <[email protected]>
Marti Martz <[email protected]>
Martial James Jefferson <[email protected]>
Martijn Schrage <[email protected]> Oblosys <[email protected]>
Matheus Marchini <[email protected]> <[email protected]>
Matt Lang <[email protected]> matt-in-a-hat <[email protected]>
Matt Reed <[email protected]> matthewreed26 <[email protected]>
Matthias Bastian <[email protected]> piepmatz <[email protected]>
Expand Down
67 changes: 66 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ Guy Margalit <[email protected]>
Azard <[email protected]>
nishijayaraj <[email protected]>
Nick Stanish <[email protected]>
Mandeep Singh <mandeep.singh@zomato.com>
Mandeep Singh <mandeep25894@gmail.com>
Prakash Palaniappan <[email protected]>
Keita Akutsu <[email protected]>
Michael Albert <[email protected]>
Expand Down Expand Up @@ -1971,5 +1971,70 @@ Steve Kinney <[email protected]>
Sebastian Mayr <[email protected]>
Vijayalakshmi Kannan <[email protected]>
Benjamin Zaslavsky <[email protected]>
Sebastian Silbermann <[email protected]>
pimlie <[email protected]>
buji <[email protected]>
Witthawat Piwawatthanapanit <[email protected]>
sgreylyn <[email protected]>
Xavier Balloy <[email protected]>
François Descamps <[email protected]>
Guillaume Flandre <[email protected]>
Pierre-Loic Doulcet <[email protected]>
Fran Herrero <[email protected]>
Francois KY <[email protected]>
suman-mitra <[email protected]>
Matheus Marchini <[email protected]>
neta <neta@netush>
Whien <[email protected]>
Chiahao Lin <[email protected]>
esbb48 <[email protected]>
Roth Peng <[email protected]>
jimliu7434 <[email protected]>
YuLun Shih <[email protected]>
Kyle Yu <[email protected]>
Ivan Wei <[email protected]>
john <[email protected]>
Jamie Davis <[email protected]>
Scya597 <[email protected]>
Zack Yang <[email protected]>
aryung chen <[email protected]>
Larry Lu <[email protected]>
Robert Rossmann <[email protected]>
薛定谔的猫 <[email protected]>
danielLin <[email protected]>
jackyen <[email protected]>
Kurt Hsu <[email protected]>
[email protected] <[email protected]>
Jason Chung <[email protected]>
Thomas den Hollander <[email protected]>
Ronald Eddy Jr <[email protected]>
Richard Littauer <[email protected]>
pkovacs <[email protected]>
zhengyuanjie <[email protected]>
Andy Chen <[email protected]>
Kcin1993 <[email protected]>
yozian <[email protected]>
jimmy <[email protected]>
Leko <[email protected]>
Aqui Tsuchida <[email protected]>
koooge <[email protected]>
kou-hin <[email protected]>
Hiroaki KARASAWA <[email protected]>
narirou <[email protected]>
Antonio V <[email protected]>
spring_raining <[email protected]>
Hiromu Yoshiwara <[email protected]>
yuza yuko <[email protected]>
smatsu-hl <[email protected]>
Bamieh <[email protected]>
WhoMeNope <[email protected]>
Junichi Kajiwara <[email protected]>
Matthew Leon <[email protected]>
Hativ <[email protected]>
Tom Hallam <[email protected]>
Hannes Magnusson <[email protected]>
ChungNgoops <[email protected]>
Jose M. Palacios Diaz <[email protected]>
hmammedzadeh <[email protected]>

# Generated by tools/update-authors.sh
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ release.
<a href="doc/changelogs/CHANGELOG_V9.md#9.0.0">9.0.0</a><br/>
</td>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.9.1">8.9.1</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.9.2">8.9.2</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.9.1">8.9.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.9.0">8.9.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.8.1">8.8.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.8.0">8.8.0</a><br/>
Expand Down
2 changes: 1 addition & 1 deletion CPP_STYLE_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* [4 spaces of indentation for statement continuations](#4-spaces-of-indentation-for-statement-continuations)
* [Align function arguments vertically](#align-function-arguments-vertically)
* [Initialization lists](#initialization-lists)
* [CamelCase for methods, functions and classes](#camelcase-for-methods-functions-and-classes)
* [CamelCase for methods, functions, and classes](#camelcase-for-methods-functions-and-classes)
* [snake\_case for local variables and parameters](#snake_case-for-local-variables-and-parameters)
* [snake\_case\_ for private class fields](#snake_case_-for-private-class-fields)
* [Space after `template`](#space-after-template)
Expand Down
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.15',
'v8_embedder_string': '-node.3',

# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
Expand Down
8 changes: 6 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ parser.add_option("--enable-vtune-profiling",
dest="enable_vtune_profiling",
help="Enable profiling support for Intel VTune profiler to profile "
"JavaScript code executed in nodejs. This feature is only available "
"for x32, x86 and x64 architectures.")
"for x32, x86, and x64 architectures.")


parser.add_option("--link-module",
Expand Down Expand Up @@ -913,7 +913,7 @@ def configure_node(o):
o['variables']['node_enable_v8_vtunejit'] = b(options.enable_vtune_profiling)
elif options.enable_vtune_profiling:
raise Exception(
'The VTune profiler for JavaScript is only supported on x32, x86 and x64 '
'The VTune profiler for JavaScript is only supported on x32, x86, and x64 '
'architectures.')
else:
o['variables']['node_enable_v8_vtunejit'] = 'false'
Expand Down Expand Up @@ -1057,6 +1057,10 @@ def configure_v8(o):
o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
o['variables']['force_dynamic_crt'] = 1 if options.shared else 0
o['variables']['node_enable_d8'] = b(options.enable_d8)
# Unconditionally force typed arrays to allocate outside the v8 heap. This
# is to prevent memory pointers from being moved around that are returned by
# Buffer::Data().
o['variables']['v8_typed_array_max_size_in_heap'] = 0
if options.enable_d8:
o['variables']['test_isolation_mode'] = 'noop' # Needed by d8.gyp.
if options.without_bundled_v8 and options.enable_d8:
Expand Down
4 changes: 2 additions & 2 deletions deps/chakrashim/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
// NOTE these macros are used by some of the tool scripts and the build
// system so their names cannot be changed without changing the scripts.
#define V8_MAJOR_VERSION 6
#define V8_MINOR_VERSION 2
#define V8_BUILD_NUMBER 414
#define V8_MINOR_VERSION 3
#define V8_BUILD_NUMBER 292
#define V8_PATCH_LEVEL 46

// Use 1 for candidates and 0 otherwise.
Expand Down
22 changes: 22 additions & 0 deletions deps/v8/.git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# git hyper-blame master ignore list.
#
# This file contains a list of git hashes of revisions to be ignored by git
# hyper-blame (in depot_tools). These revisions are considered "unimportant" in
# that they are unlikely to be what you are interested in when blaming.
#
# Instructions:
# - Only large (generally automated) reformatting or renaming CLs should be
# added to this list. Do not put things here just because you feel they are
# trivial or unimportant. If in doubt, do not put it on this list.
# - Precede each revision with a comment containing the first line of its log.
# For bulk work over many commits, place all commits in a block with a single
# comment at the top describing the work done in those commits.
# - Only put full 40-character hashes on this list (not short hashes or any
# other revision reference).
# - Append to the bottom of the file (revisions should be in chronological order
# from oldest to newest).
# - Because you must use a hash, you need to append to this list in a follow-up
# CL to the actual reformatting CL that you are trying to ignore.

# Update of quotations in DEPS file.
e50b49a0e38b34e2b28e026f4d1c7e0da0c7bb1a
5 changes: 2 additions & 3 deletions deps/v8/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,15 @@
!/testing/gtest/include/gtest/gtest_prod.h
/third_party/*
!/third_party/binutils
!/third_party/eu-strip
!/third_party/inspector_protocol
/tools/clang
/tools/gcmole/gcmole-tools
/tools/gcmole/gcmole-tools.tar.gz
/tools/gyp
/tools/jsfunfuzz/jsfunfuzz
/tools/jsfunfuzz/jsfunfuzz.tar.gz
/tools/luci-go/linux64/isolate
/tools/luci-go/mac64/isolate
/tools/luci-go/win64/isolate.exe
/tools/luci-go
/tools/oom_dump/oom_dump
/tools/oom_dump/oom_dump.o
/tools/swarming_client
Expand Down
5 changes: 3 additions & 2 deletions deps/v8/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Yandex LLC <*@yandex-team.ru>
StrongLoop, Inc. <*@strongloop.com>
Facebook, Inc. <*@fb.com>
Facebook, Inc. <*@oculus.com>
Vewd Software AS <*@vewd.com>

Aaron Bieber <[email protected]>
Abdulla Kamar <[email protected]>
Expand All @@ -42,7 +43,7 @@ Alexis Campailla <[email protected]>
Andreas Anyuru <[email protected]>
Andrew Paprocki <[email protected]>
Andrei Kashcha <[email protected]>
Anna Henningsen <[email protected]>
Anna Henningsen <[email protected]>
Bangfu Tao <[email protected]>
Ben Noordhuis <[email protected]>
Benjamin Tan <[email protected]>
Expand Down Expand Up @@ -135,4 +136,4 @@ Wiktor Garbacz <[email protected]>
Yu Yin <[email protected]>
Zac Hansen <[email protected]>
Zhongping Wang <[email protected]>
柳荣一 <[email protected]>
柳荣一 <[email protected]>
Loading

0 comments on commit e104f74

Please sign in to comment.