diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-04-29 22:35:21 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-04-29 22:35:21 +0200 |
commit | 2f75785c015fecc33565fe5ee3a483b0d4e5cc6d (patch) | |
tree | ad66b4eaba8cedfeb7cfb40b0871307ae08d25e8 /deps/v8/tools/gcmole | |
parent | 5ddf7f4200894a7304d7c07bbbd8773fac3509d1 (diff) | |
download | android-node-v8-2f75785c015fecc33565fe5ee3a483b0d4e5cc6d.tar.gz android-node-v8-2f75785c015fecc33565fe5ee3a483b0d4e5cc6d.tar.bz2 android-node-v8-2f75785c015fecc33565fe5ee3a483b0d4e5cc6d.zip |
deps: upgrade v8 to 3.18.4
Diffstat (limited to 'deps/v8/tools/gcmole')
-rw-r--r-- | deps/v8/tools/gcmole/README | 2 | ||||
-rw-r--r-- | deps/v8/tools/gcmole/gcmole.cc | 2 | ||||
-rw-r--r-- | deps/v8/tools/gcmole/gcmole.lua | 39 |
3 files changed, 20 insertions, 23 deletions
diff --git a/deps/v8/tools/gcmole/README b/deps/v8/tools/gcmole/README index 02cf88ccc1..37f8afbd6f 100644 --- a/deps/v8/tools/gcmole/README +++ b/deps/v8/tools/gcmole/README @@ -21,7 +21,7 @@ PREREQUISITES ----------------------------------------------------------------- 1) Install Lua 5.1 -2) Get LLVM and Clang sources and build them. +2) Get LLVM 2.9 and Clang 2.9 sources and build them. Follow the instructions on http://clang.llvm.org/get_started.html. diff --git a/deps/v8/tools/gcmole/gcmole.cc b/deps/v8/tools/gcmole/gcmole.cc index 38ee6e07ef..bdff18952b 100644 --- a/deps/v8/tools/gcmole/gcmole.cc +++ b/deps/v8/tools/gcmole/gcmole.cc @@ -587,7 +587,6 @@ class FunctionAnalyzer { VISIT(StmtExpr); VISIT(StringLiteral); VISIT(SubstNonTypeTemplateParmPackExpr); - VISIT(UnaryExprOrTypeTraitExpr); VISIT(UnaryOperator); VISIT(UnaryTypeTraitExpr); VISIT(VAArgExpr); @@ -634,7 +633,6 @@ class FunctionAnalyzer { IGNORE_EXPR(StmtExpr); IGNORE_EXPR(StringLiteral); IGNORE_EXPR(SubstNonTypeTemplateParmPackExpr); - IGNORE_EXPR(UnaryExprOrTypeTraitExpr); IGNORE_EXPR(UnaryTypeTraitExpr); IGNORE_EXPR(VAArgExpr); IGNORE_EXPR(GNUNullExpr); diff --git a/deps/v8/tools/gcmole/gcmole.lua b/deps/v8/tools/gcmole/gcmole.lua index 09db54754f..b259ee0143 100644 --- a/deps/v8/tools/gcmole/gcmole.lua +++ b/deps/v8/tools/gcmole/gcmole.lua @@ -80,11 +80,16 @@ end -- Clang invocation local CLANG_BIN = os.getenv "CLANG_BIN" +local CLANG_PLUGINS = os.getenv "CLANG_PLUGINS" if not CLANG_BIN or CLANG_BIN == "" then error "CLANG_BIN not set" end +if not CLANG_PLUGINS or CLANG_PLUGINS == "" then + CLANG_PLUGINS = DIR +end + local function MakeClangCommandLine(plugin, plugin_args, triple, arch_define) if plugin_args then for i = 1, #plugin_args do @@ -92,7 +97,7 @@ local function MakeClangCommandLine(plugin, plugin_args, triple, arch_define) end plugin_args = " " .. table.concat(plugin_args, " ") end - return CLANG_BIN .. "/clang -cc1 -load " .. DIR .. "/libgcmole.so" + return CLANG_BIN .. "/clang -cc1 -load " .. CLANG_PLUGINS .. "/libgcmole.so" .. " -plugin " .. plugin .. (plugin_args or "") .. " -triple " .. triple @@ -117,31 +122,25 @@ function InvokeClangPluginForEachFile(filenames, cfg, func) end ------------------------------------------------------------------------------- --- SConscript parsing +-- GYP file parsing -local function ParseSConscript() - local f = assert(io.open("src/SConscript"), "failed to open SConscript") - local sconscript = f:read('*a') +local function ParseGYPFile() + local f = assert(io.open("tools/gyp/v8.gyp"), "failed to open GYP file") + local gyp = f:read('*a') f:close() - local SOURCES = sconscript:match "SOURCES = {(.-)}"; + local result = {} - local sources = {} - - for condition, list in - SOURCES:gmatch "'([^']-)': Split%(\"\"\"(.-)\"\"\"%)" do + for condition, sources in + gyp:gmatch "'sources': %[.-### gcmole%((.-)%) ###(.-)%]" do local files = {} - for file in list:gmatch "[^%s]+" do table.insert(files, file) end - sources[condition] = files - end - - for condition, list in SOURCES:gmatch "'([^']-)': %[(.-)%]" do - local files = {} - for file in list:gmatch "'([^']-)'" do table.insert(files, file) end - sources[condition] = files + for file in sources:gmatch "'%.%./%.%./src/([^']-%.cc)'" do + table.insert(files, file) + end + result[condition] = files end - return sources + return result end local function EvaluateCondition(cond, props) @@ -165,7 +164,7 @@ local function BuildFileList(sources, props) return list end -local sources = ParseSConscript() +local sources = ParseGYPFile() local function FilesForArch(arch) return BuildFileList(sources, { os = 'linux', |