Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v1.x into next, upgrade v8 #1399

Merged
merged 10 commits into from
Apr 16, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions deps/v8/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
.settings
.*.sw?
bsuite
compile_commands.json
d8
d8_g
gccauses
Expand Down
193 changes: 193 additions & 0 deletions deps/v8/.ycm_extra_conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
# Copyright 2015 the V8 project authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

# Autocompletion config for YouCompleteMe in V8.
#
# USAGE:
#
# 1. Install YCM [https://github.com/Valloric/YouCompleteMe]
# (Googlers should check out [go/ycm])
#
# 2. Profit
#
#
# Usage notes:
#
# * You must use ninja & clang to build V8.
#
# * You must have run gyp_v8 and built V8 recently.
#
#
# Hacking notes:
#
# * The purpose of this script is to construct an accurate enough command line
# for YCM to pass to clang so it can build and extract the symbols.
#
# * Right now, we only pull the -I and -D flags. That seems to be sufficient
# for everything I've used it for.
#
# * That whole ninja & clang thing? We could support other configs if someone
# were willing to write the correct commands and a parser.
#
# * This has only been tested on gTrusty.


import os
import os.path
import subprocess
import sys


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


def PathExists(*args):
return os.path.exists(os.path.join(*args))


def FindV8SrcFromFilename(filename):
"""Searches for the root of the V8 checkout.

Simply checks parent directories until it finds .gclient and v8/.

Args:
filename: (String) Path to source file being edited.

Returns:
(String) Path of 'v8/', or None if unable to find.
"""
curdir = os.path.normpath(os.path.dirname(filename))
while not (PathExists(curdir, 'v8') and PathExists(curdir, 'v8', 'DEPS')
and (PathExists(curdir, '.gclient')
or PathExists(curdir, 'v8', '.git'))):
nextdir = os.path.normpath(os.path.join(curdir, '..'))
if nextdir == curdir:
return None
curdir = nextdir
return os.path.join(curdir, 'v8')


def GetClangCommandFromNinjaForFilename(v8_root, filename):
"""Returns the command line to build |filename|.

Asks ninja how it would build the source file. If the specified file is a
header, tries to find its companion source file first.

Args:
v8_root: (String) Path to v8/.
filename: (String) Path to source file being edited.

Returns:
(List of Strings) Command line arguments for clang.
"""
if not v8_root:
return []

# Generally, everyone benefits from including V8's root, because all of
# V8's includes are relative to that.
v8_flags = ['-I' + os.path.join(v8_root)]

# Version of Clang used to compile V8 can be newer then version of
# libclang that YCM uses for completion. So it's possible that YCM's libclang
# doesn't know about some used warning options, which causes compilation
# warnings (and errors, because of '-Werror');
v8_flags.append('-Wno-unknown-warning-option')

# Header files can't be built. Instead, try to match a header file to its
# corresponding source file.
if filename.endswith('.h'):
alternates = ['.cc', '.cpp']
for alt_extension in alternates:
alt_name = filename[:-2] + alt_extension
if os.path.exists(alt_name):
filename = alt_name
break
else:
if filename.endswith('-inl.h'):
for alt_extension in alternates:
alt_name = filename[:-6] + alt_extension
if os.path.exists(alt_name):
filename = alt_name
break;
else:
# If this is a standalone -inl.h file with no source, the best we can
# do is try to use the default flags.
return v8_flags
else:
# If this is a standalone .h file with no source, the best we can do is
# try to use the default flags.
return v8_flags

sys.path.append(os.path.join(v8_root, 'tools', 'ninja'))
from ninja_output import GetNinjaOutputDirectory
out_dir = os.path.realpath(GetNinjaOutputDirectory(v8_root))

# Ninja needs the path to the source file relative to the output build
# directory.
rel_filename = os.path.relpath(os.path.realpath(filename), out_dir)

# Ask ninja how it would build our source file.
p = subprocess.Popen(['ninja', '-v', '-C', out_dir, '-t',
'commands', rel_filename + '^'],
stdout=subprocess.PIPE)
stdout, stderr = p.communicate()
if p.returncode:
return v8_flags

# Ninja might execute several commands to build something. We want the last
# clang command.
clang_line = None
for line in reversed(stdout.split('\n')):
if 'clang' in line:
clang_line = line
break
else:
return v8_flags

# Parse flags that are important for YCM's purposes.
for flag in clang_line.split(' '):
if flag.startswith('-I'):
# Relative paths need to be resolved, because they're relative to the
# output dir, not the source.
if flag[2] == '/':
v8_flags.append(flag)
else:
abs_path = os.path.normpath(os.path.join(out_dir, flag[2:]))
v8_flags.append('-I' + abs_path)
elif flag.startswith('-std'):
v8_flags.append(flag)
elif flag.startswith('-') and flag[1] in 'DWFfmO':
if flag == '-Wno-deprecated-register' or flag == '-Wno-header-guard':
# These flags causes libclang (3.3) to crash. Remove it until things
# are fixed.
continue
v8_flags.append(flag)

return v8_flags


def FlagsForFile(filename):
"""This is the main entry point for YCM. Its interface is fixed.

Args:
filename: (String) Path to source file being edited.

Returns:
(Dictionary)
'flags': (List of Strings) Command line flags.
'do_cache': (Boolean) True if the result should be cached.
"""
v8_root = FindV8SrcFromFilename(filename)
v8_flags = GetClangCommandFromNinjaForFilename(v8_root, filename)
final_flags = flags + v8_flags
return {
'flags': final_flags,
'do_cache': True
}
86 changes: 52 additions & 34 deletions deps/v8/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -3,78 +3,96 @@
#
# Name/Organization <email address>

Google Inc.
Sigma Designs Inc.
ARM Ltd.
Hewlett-Packard Development Company, LP
Igalia, S.L.
Joyent, Inc.
Bloomberg Finance L.P.
NVIDIA Corporation
BlackBerry Limited
Opera Software ASA
Intel Corporation
MIPS Technologies, Inc.
Imagination Technologies, LLC
Loongson Technology Corporation Limited
Google Inc. <*@google.com>
The Chromium Authors <*@chromium.org>
Sigma Designs Inc. <*@sdesigns.com>
ARM Ltd. <*@arm.com>
Hewlett-Packard Development Company, LP <*@palm.com>
Igalia, S.L. <*@igalia.com>
Joyent, Inc. <*@joyent.com>
Bloomberg Finance L.P. <*@bloomberg.net>
NVIDIA Corporation <*@nvidia.com>
BlackBerry Limited <*@blackberry.com>
Opera Software ASA <*@opera.com>
Intel Corporation <*@intel.com>
MIPS Technologies, Inc. <*@mips.com>
Imagination Technologies, LLC <*@imgtec.com>
Loongson Technology Corporation Limited <*@loongson.cn>
Code Aurora Forum <*@codeaurora.org>
Home Jinni Inc. <*@homejinni.com>
IBM Inc. <*@*.ibm.com>
Samsung <*@*.samsung.com>
Joyent, Inc <*@joyent.com>
RT-RK Computer Based System <*@rt-rk.com>
Amazon, Inc <*@amazon.com>
ST Microelectronics <*@st.com>
Yandex LLC <*@yandex-team.ru>
StrongLoop, Inc. <*@strongloop.com>

Aaron Bieber <[email protected]>
Abdulla Kamar <[email protected]>
Akinori MUSHA <[email protected]>
Alexander Botero-Lowry <[email protected]>
Alexander Karpinsky <[email protected]>
Alexandre Rames <[email protected]>
Alexandre Vassalotti <[email protected]>
Alexis Campailla <[email protected]>
Andreas Anyuru <[email protected]>
Baptiste Afsa <[email protected]>
Andrew Paprocki <[email protected]>
Andrei Kashcha <[email protected]>
Ben Noordhuis <[email protected]>
Bert Belder <[email protected]>
Burcu Dogan <[email protected]>
Caitlin Potter <[email protected]>
Craig Schlenter <[email protected]>
Chunyang Dai <chunyang.dai@intel.com>
Christopher A. Taylor <chris@gameclosure.com>
Daniel Andersson <[email protected]>
Daniel James <[email protected]>
Derek J Conrod <[email protected]>
Dineel D Sule <[email protected]>
Douglas Crosher <[email protected]>
Erich Ocean <[email protected]>
Fedor Indutny <[email protected]>
Felix Geisendörfer <[email protected]>
Filipe David Manana <[email protected]>
Haitao Feng <[email protected]>
Geoffrey Garside <[email protected]>
Han Choongwoo <[email protected]>
Hirofumi Mako <[email protected]>
Ioseb Dzmanashvili <[email protected]>
Isiah Meadows <[email protected]>
Jacob Bramley <[email protected]>
Jan de Mooij <[email protected]>
Jay Freeman <[email protected]>
James Pike <[email protected]>
Joel Stanley <[email protected]>
Jianghua Yang <[email protected]>
Joel Stanley <[email protected]>
Johan Bergström <[email protected]>
John Jozwiak <[email protected]>
Jonathan Liu <[email protected]>
Kun Zhang <[email protected]>
Kang-Hao (Kenny) Lu <[email protected]>
Luis Reis <[email protected]>
Martyn Capewell <[email protected]>
Luke Zarko <[email protected]>
Maciej Małecki <[email protected]>
Mathias Bynens <[email protected]>
Matt Hanselman <[email protected]>
Matthew Sporleder <[email protected]>
Maxim Mossienko <[email protected]>
Michael Lutz <[email protected]>
Michael Smith <[email protected]>
Mike Gilbert <[email protected]>
Nicolas Antonius Ernst Leopold Maria Kaiser <[email protected]>
Paolo Giarrusso <[email protected]>
Patrick Gansterer <[email protected]>
Peter Varga <[email protected]>
Paul Lind <[email protected]>
Rafal Krypa <[email protected]>
Rajeev R Krithivasan <[email protected]>
Refael Ackermann <[email protected]>
Rene Rebe <[email protected]>
Robert Mustacchi <[email protected]>
Rodolph Perfetta <rodolph.perfetta@arm.com>
Ryan Dahl <[email protected]>
Robert Nagy <robert.nagy@gmail.com>
Ryan Dahl <[email protected]>
Sandro Santilli <[email protected]>
Sanjoy Das <[email protected]>
Subrato K De <[email protected]>
Seo Sanghyeon <[email protected]>
Tobias Burnus <[email protected]>
Vincent Belliard <vincent.belliard@arm.com>
Victor Costan <costan@gmail.com>
Vlad Burlik <[email protected]>
Weiliang Lin<[email protected]>
Xi Qian <[email protected]>
Yuqiang Xian <[email protected]>
Zaheer Ahmad <[email protected]>
Vladimir Shutoff <[email protected]>
Yu Yin <[email protected]>
Zhongping Wang <[email protected]>
柳荣一 <[email protected]>
Loading