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

Commit e104f74

Browse files
chakrabotchakrabot
committed
meta: merge node/master into node-chakracore/master
Merge cd174df as of 2017-12-06 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Taylor Woll <[email protected]>
2 parents 985faa1 + cd174df commit e104f74

1,256 files changed

Lines changed: 68784 additions & 45258 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ Lydia Kats <[email protected]> Lydia Katsamberis <[email protected]>
198198
Maciej Małecki <[email protected]> <[email protected]>
199199
Malte-Thorben Bruns <[email protected]> <[email protected]>
200200
Malte-Thorben Bruns <[email protected]> skenqbx <[email protected]>
201+
Mandeep Singh <[email protected]> <[email protected]>
201202
Manil Chowdhurian <[email protected]> Chowdhurian <[email protected]>
202203
Marcelo Gobelli <[email protected]> decareano <[email protected]>
203204
Marcin Cieślak <[email protected]>
@@ -206,6 +207,7 @@ Marcin Zielinski <[email protected]> marzelin <[email protected]>
206207
Marti Martz <[email protected]>
207208
Martial James Jefferson <[email protected]>
208209
Martijn Schrage <[email protected]> Oblosys <[email protected]>
210+
Matheus Marchini <[email protected]> <[email protected]>
209211
Matt Lang <[email protected]> matt-in-a-hat <[email protected]>
210212
Matt Reed <[email protected]> matthewreed26 <[email protected]>
211213
Matthias Bastian <[email protected]> piepmatz <[email protected]>

‎AUTHORS‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@ Guy Margalit <[email protected]>
16161616
Azard <[email protected]>
16171617
nishijayaraj <[email protected]>
16181618
Nick Stanish <[email protected]>
1619-
Mandeep Singh <mandeep.singh@zomato.com>
1619+
Mandeep Singh <mandeep25894@gmail.com>
16201620
Prakash Palaniappan <[email protected]>
16211621
Keita Akutsu <[email protected]>
16221622
Michael Albert <[email protected]>
@@ -1971,5 +1971,70 @@ Steve Kinney <[email protected]>
19711971
Sebastian Mayr <[email protected]>
19721972
Vijayalakshmi Kannan <[email protected]>
19731973
Benjamin Zaslavsky <[email protected]>
1974+
Sebastian Silbermann <[email protected]>
1975+
pimlie <[email protected]>
1976+
buji <[email protected]>
1977+
Witthawat Piwawatthanapanit <[email protected]>
1978+
sgreylyn <[email protected]>
1979+
Xavier Balloy <[email protected]>
1980+
François Descamps <[email protected]>
1981+
Guillaume Flandre <[email protected]>
1982+
Pierre-Loic Doulcet <[email protected]>
1983+
Fran Herrero <[email protected]>
1984+
Francois KY <[email protected]>
1985+
suman-mitra <[email protected]>
1986+
Matheus Marchini <[email protected]>
1987+
neta <neta@netush>
1988+
Whien <[email protected]>
1989+
Chiahao Lin <[email protected]>
1990+
esbb48 <[email protected]>
1991+
Roth Peng <[email protected]>
1992+
jimliu7434 <[email protected]>
1993+
YuLun Shih <[email protected]>
1994+
Kyle Yu <[email protected]>
1995+
Ivan Wei <[email protected]>
1996+
john <[email protected]>
1997+
Jamie Davis <[email protected]>
1998+
Scya597 <[email protected]>
1999+
Zack Yang <[email protected]>
2000+
aryung chen <[email protected]>
2001+
Larry Lu <[email protected]>
2002+
Robert Rossmann <[email protected]>
2003+
薛定谔的猫 <[email protected]>
2004+
danielLin <[email protected]>
2005+
jackyen <[email protected]>
2006+
Kurt Hsu <[email protected]>
2007+
[email protected] <[email protected]>
2008+
Jason Chung <[email protected]>
2009+
Thomas den Hollander <[email protected]>
2010+
Ronald Eddy Jr <[email protected]>
2011+
Richard Littauer <[email protected]>
2012+
pkovacs <[email protected]>
2013+
zhengyuanjie <[email protected]>
2014+
Andy Chen <[email protected]>
2015+
Kcin1993 <[email protected]>
2016+
yozian <[email protected]>
2017+
jimmy <[email protected]>
2018+
Leko <[email protected]>
2019+
Aqui Tsuchida <[email protected]>
2020+
koooge <[email protected]>
2021+
kou-hin <[email protected]>
2022+
Hiroaki KARASAWA <[email protected]>
2023+
narirou <[email protected]>
2024+
Antonio V <[email protected]>
2025+
spring_raining <[email protected]>
2026+
Hiromu Yoshiwara <[email protected]>
2027+
yuza yuko <[email protected]>
2028+
smatsu-hl <[email protected]>
2029+
Bamieh <[email protected]>
2030+
WhoMeNope <[email protected]>
2031+
Junichi Kajiwara <[email protected]>
2032+
Matthew Leon <[email protected]>
2033+
Hativ <[email protected]>
2034+
Tom Hallam <[email protected]>
2035+
Hannes Magnusson <[email protected]>
2036+
ChungNgoops <[email protected]>
2037+
Jose M. Palacios Diaz <[email protected]>
2038+
hmammedzadeh <[email protected]>
19742039

19752040
# Generated by tools/update-authors.sh

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ release.
3434
<a href="doc/changelogs/CHANGELOG_V9.md#9.0.0">9.0.0</a><br/>
3535
</td>
3636
<td valign="top">
37-
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.9.1">8.9.1</a></b><br/>
37+
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.9.2">8.9.2</a></b><br/>
38+
<a href="doc/changelogs/CHANGELOG_V8.md#8.9.1">8.9.1</a><br/>
3839
<a href="doc/changelogs/CHANGELOG_V8.md#8.9.0">8.9.0</a><br/>
3940
<a href="doc/changelogs/CHANGELOG_V8.md#8.8.1">8.8.1</a><br/>
4041
<a href="doc/changelogs/CHANGELOG_V8.md#8.8.0">8.8.0</a><br/>

‎CPP_STYLE_GUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* [4 spaces of indentation for statement continuations](#4-spaces-of-indentation-for-statement-continuations)
99
* [Align function arguments vertically](#align-function-arguments-vertically)
1010
* [Initialization lists](#initialization-lists)
11-
* [CamelCase for methods, functions and classes](#camelcase-for-methods-functions-and-classes)
11+
* [CamelCase for methods, functions, and classes](#camelcase-for-methods-functions-and-classes)
1212
* [snake\_case for local variables and parameters](#snake_case-for-local-variables-and-parameters)
1313
* [snake\_case\_ for private class fields](#snake_case_-for-private-class-fields)
1414
* [Space after `template`](#space-after-template)

‎common.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# Reset this number to 0 on major V8 upgrades.
3131
# Increment by one for each non-official patch applied to deps/v8.
32-
'v8_embedder_string': '-node.15',
32+
'v8_embedder_string': '-node.3',
3333

3434
# Enable disassembler for `--print-code` v8 options
3535
'v8_enable_disassembler': 1,

‎configure‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ parser.add_option("--enable-vtune-profiling",
146146
dest="enable_vtune_profiling",
147147
help="Enable profiling support for Intel VTune profiler to profile "
148148
"JavaScript code executed in nodejs. This feature is only available "
149-
"for x32, x86 and x64 architectures.")
149+
"for x32, x86, and x64 architectures.")
150150

151151

152152
parser.add_option("--link-module",
@@ -913,7 +913,7 @@ def configure_node(o):
913913
o['variables']['node_enable_v8_vtunejit'] = b(options.enable_vtune_profiling)
914914
elif options.enable_vtune_profiling:
915915
raise Exception(
916-
'The VTune profiler for JavaScript is only supported on x32, x86 and x64 '
916+
'The VTune profiler for JavaScript is only supported on x32, x86, and x64 '
917917
'architectures.')
918918
else:
919919
o['variables']['node_enable_v8_vtunejit'] = 'false'
@@ -1057,6 +1057,10 @@ def configure_v8(o):
10571057
o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
10581058
o['variables']['force_dynamic_crt'] = 1 if options.shared else 0
10591059
o['variables']['node_enable_d8'] = b(options.enable_d8)
1060+
# Unconditionally force typed arrays to allocate outside the v8 heap. This
1061+
# is to prevent memory pointers from being moved around that are returned by
1062+
# Buffer::Data().
1063+
o['variables']['v8_typed_array_max_size_in_heap'] = 0
10601064
if options.enable_d8:
10611065
o['variables']['test_isolation_mode'] = 'noop' # Needed by d8.gyp.
10621066
if options.without_bundled_v8 and options.enable_d8:

‎deps/chakrashim/include/v8-version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// NOTE these macros are used by some of the tool scripts and the build
1010
// system so their names cannot be changed without changing the scripts.
1111
#define V8_MAJOR_VERSION 6
12-
#define V8_MINOR_VERSION 2
13-
#define V8_BUILD_NUMBER 414
12+
#define V8_MINOR_VERSION 3
13+
#define V8_BUILD_NUMBER 292
1414
#define V8_PATCH_LEVEL 46
1515

1616
// Use 1 for candidates and 0 otherwise.

‎deps/v8/.git-blame-ignore-revs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# git hyper-blame master ignore list.
2+
#
3+
# This file contains a list of git hashes of revisions to be ignored by git
4+
# hyper-blame (in depot_tools). These revisions are considered "unimportant" in
5+
# that they are unlikely to be what you are interested in when blaming.
6+
#
7+
# Instructions:
8+
# - Only large (generally automated) reformatting or renaming CLs should be
9+
# added to this list. Do not put things here just because you feel they are
10+
# trivial or unimportant. If in doubt, do not put it on this list.
11+
# - Precede each revision with a comment containing the first line of its log.
12+
# For bulk work over many commits, place all commits in a block with a single
13+
# comment at the top describing the work done in those commits.
14+
# - Only put full 40-character hashes on this list (not short hashes or any
15+
# other revision reference).
16+
# - Append to the bottom of the file (revisions should be in chronological order
17+
# from oldest to newest).
18+
# - Because you must use a hash, you need to append to this list in a follow-up
19+
# CL to the actual reformatting CL that you are trying to ignore.
20+
21+
# Update of quotations in DEPS file.
22+
e50b49a0e38b34e2b28e026f4d1c7e0da0c7bb1a

‎deps/v8/.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,15 @@
6868
!/testing/gtest/include/gtest/gtest_prod.h
6969
/third_party/*
7070
!/third_party/binutils
71+
!/third_party/eu-strip
7172
!/third_party/inspector_protocol
7273
/tools/clang
7374
/tools/gcmole/gcmole-tools
7475
/tools/gcmole/gcmole-tools.tar.gz
7576
/tools/gyp
7677
/tools/jsfunfuzz/jsfunfuzz
7778
/tools/jsfunfuzz/jsfunfuzz.tar.gz
78-
/tools/luci-go/linux64/isolate
79-
/tools/luci-go/mac64/isolate
80-
/tools/luci-go/win64/isolate.exe
79+
/tools/luci-go
8180
/tools/oom_dump/oom_dump
8281
/tools/oom_dump/oom_dump.o
8382
/tools/swarming_client

‎deps/v8/AUTHORS‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Yandex LLC <*@yandex-team.ru>
3030
StrongLoop, Inc. <*@strongloop.com>
3131
Facebook, Inc. <*@fb.com>
3232
Facebook, Inc. <*@oculus.com>
33+
Vewd Software AS <*@vewd.com>
3334

3435
Aaron Bieber <[email protected]>
3536
Abdulla Kamar <[email protected]>
@@ -42,7 +43,7 @@ Alexis Campailla <[email protected]>
4243
Andreas Anyuru <[email protected]>
4344
Andrew Paprocki <[email protected]>
4445
Andrei Kashcha <[email protected]>
45-
Anna Henningsen <[email protected]>
46+
Anna Henningsen <[email protected]>
4647
Bangfu Tao <[email protected]>
4748
Ben Noordhuis <[email protected]>
4849
Benjamin Tan <[email protected]>
@@ -135,4 +136,4 @@ Wiktor Garbacz <[email protected]>
135136
Yu Yin <[email protected]>
136137
Zac Hansen <[email protected]>
137138
Zhongping Wang <[email protected]>
138-
柳荣一 <[email protected]>
139+
柳荣一 <[email protected]>

0 commit comments

Comments
 (0)