Resolve conflicts

Author: iefserge

deps/v8/.clang-format

@@ -1,4 +1,4 @@
 # Defines the Google C++ style for automatic reformatting.
 # http://clang.llvm.org/docs/ClangFormatStyleOptions.html
 BasedOnStyle: Google
-MaxEmptyLinesToKeep: 2
+MaxEmptyLinesToKeep: 1

deps/v8/.gitignore

@@ -40,12 +40,9 @@ gcsuspects
 shell
 shell_g
 /_*
-/base/trace_event/common
-/build/Debug
-/build/gyp
-/build/ipch/
-/build/Release
-/build/win_toolchain.json
+/base
+/build
+/gypfiles/win_toolchain.json
 /buildtools
 /hydrogen.cfg
 /obj
@@ -59,18 +56,23 @@ shell_g
 /test/promises-aplus/sinon
 /test/simdjs/data
 /test/test262/data
+/test/test262/data.tar
 /testing/gmock
 /testing/gtest
 /third_party
 /third_party/icu
 /third_party/llvm
 /third_party/llvm-build
 /tools/clang
-/tools/jsfunfuzz
-/tools/jsfunfuzz.zip
+/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/mb
 /tools/oom_dump/oom_dump
 /tools/oom_dump/oom_dump.o
 /tools/swarming_client
@@ -84,7 +86,9 @@ GTAGS
 GRTAGS
 GSYMS
 GPATH
+tags
 gtags.files
 turbo*.cfg
 turbo*.dot
 turbo*.json
+v8.ignition_dispatches_table.json

deps/v8/.gn

@@ -0,0 +1,52 @@
+# This file is used by the GN meta build system to find the root of the source
+# tree and to set startup options. For documentation on the values set in this
+# file, run "gn help dotfile" at the command line.
+
+# The location of the build configuration file.
+buildconfig = "//build/config/BUILDCONFIG.gn"
+
+# The secondary source root is a parallel directory tree where
+# GN build files are placed when they can not be placed directly
+# in the source tree, e.g. for third party source trees.
+secondary_source = "//build/secondary/"
+
+# These are the targets to check headers for by default. The files in targets
+# matching these patterns (see "gn help label_pattern" for format) will have
+# their includes checked for proper dependencies when you run either
+# "gn check" or "gn gen --check".
+check_targets = [
+]
+
+# These are the list of GN files that run exec_script. This whitelist exists
+# to force additional review for new uses of exec_script, which is strongly
+# discouraged except for gypi_to_gn calls.
+exec_script_whitelist = [
+  "//build/config/android/BUILD.gn",
+  "//build/config/android/config.gni",
+  "//build/config/android/internal_rules.gni",
+  "//build/config/android/rules.gni",
+  "//build/config/BUILD.gn",
+  "//build/config/compiler/BUILD.gn",
+  "//build/config/gcc/gcc_version.gni",
+  "//build/config/ios/ios_sdk.gni",
+  "//build/config/linux/atk/BUILD.gn",
+  "//build/config/linux/BUILD.gn",
+  "//build/config/linux/pkg_config.gni",
+  "//build/config/mac/mac_sdk.gni",
+  "//build/config/posix/BUILD.gn",
+  "//build/config/sysroot.gni",
+  "//build/config/win/BUILD.gn",
+  "//build/config/win/visual_studio_version.gni",
+  "//build/gn_helpers.py",
+  "//build/gypi_to_gn.py",
+  "//build/toolchain/concurrent_links.gni",
+  "//build/toolchain/gcc_toolchain.gni",
+  "//build/toolchain/mac/BUILD.gn",
+  "//build/toolchain/nacl/BUILD.gn",
+  "//build/toolchain/win/BUILD.gn",
+  "//build/util/branding.gni",
+  "//build/util/version.gni",
+  "//test/cctest/BUILD.gn",
+  "//test/test262/BUILD.gn",
+  "//test/unittests/BUILD.gn",
+]

deps/v8/.ycm_extra_conf.py

@@ -42,7 +42,7 @@
 # Flags from YCM's default config.
 flags = [
 '-DUSE_CLANG_COMPLETER',
-'-std=gnu++0x',
+'-std=gnu++11',
 '-x',
 'c++',
 ]

deps/v8/AUTHORS

@@ -40,7 +40,10 @@ Alexis Campailla <alexis@janeasystems.com>
 Andreas Anyuru <andreas.anyuru@gmail.com>
 Andrew Paprocki <andrew@ishiboo.com>
 Andrei Kashcha <anvaka@gmail.com>
+Anna Henningsen <addaleax@gmail.com>
+Bangfu Tao <bangfu.tao@samsung.com>
 Ben Noordhuis <info@bnoordhuis.nl>
+Benjamin Tan <demoneaux@gmail.com>
 Bert Belder <bertbelder@gmail.com>
 Burcu Dogan <burcujdogan@gmail.com>
 Caitlin Potter <caitpotter88@gmail.com>
@@ -60,6 +63,7 @@ Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
 Geoffrey Garside <ggarside@gmail.com>
 Han Choongwoo <cwhan.tunz@gmail.com>
 Hirofumi Mako <mkhrfm@gmail.com>
+Honggyu Kim <honggyu.kp@gmail.com>
 Ioseb Dzmanashvili <ioseb.dzmanashvili@gmail.com>
 Isiah Meadows <impinball@gmail.com>
 Jan de Mooij <jandemooij@gmail.com>
@@ -69,6 +73,7 @@ Jianghua Yang <jianghua.yjh@alibaba-inc.com>
 Joel Stanley <joel@jms.id.au>
 Johan Bergström <johan@bergstroem.nu>
 Jonathan Liu <net147@gmail.com>
+Julien Brianceau <jbriance@cisco.com>
 JunHo Seo <sejunho@gmail.com>
 Kang-Hao (Kenny) Lu <kennyluck@csail.mit.edu>
 Karl Skomski <karl@skomski.com>
@@ -85,7 +90,9 @@ Michael Smith <mike@w3.org>
 Mike Gilbert <floppymaster@gmail.com>
 Mike Pennisi <mike@mikepennisi.com>
 Milton Chiang <milton.chiang@mediatek.com>
+Myeong-bo Shim <m0609.shim@samsung.com>
 Nicolas Antonius Ernst Leopold Maria Kaiser <nikai@nikai.net>
+Oleksandr Chekhovskyi <oleksandr.chekhovskyi@gmail.com>
 Paolo Giarrusso <p.giarrusso@gmail.com>
 Patrick Gansterer <paroga@paroga.com>
 Peter Varga <pvarga@inf.u-szeged.hu>
@@ -107,5 +114,6 @@ Vlad Burlik <vladbph@gmail.com>
 Vladimir Krivosheev <develar@gmail.com>
 Vladimir Shutoff <vovan@shutoff.ru>
 Yu Yin <xwafish@gmail.com>
+Zac Hansen <xaxxon@gmail.com>
 Zhongping Wang <kewpie.w.zp@gmail.com>
 柳荣一 <admin@web-tinker.com>