From 86dac80d98aa64d073953a26e1fbe5e838fcc14f Mon Sep 17 00:00:00 2001 From: Mike Reinstein Date: Tue, 3 Jul 2018 15:09:36 -0700 Subject: [PATCH] upgrade v8 to 6.9.297. remove IIFE workaround for bug in v8 snapshot serializer --- .gclient | 2 +- src/snapshot_creator.cc | 28 +--------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/.gclient b/.gclient index bbbba0b972..409a8b0f89 100644 --- a/.gclient +++ b/.gclient @@ -1,5 +1,5 @@ solutions = [{ - 'url': 'https://chromium.googlesource.com/v8/v8.git@6.8-lkgr', + 'url': 'https://chromium.googlesource.com/v8/v8.git@6.9.297', 'name': 'v8', 'deps_file': 'DEPS', 'custom_deps': { diff --git a/src/snapshot_creator.cc b/src/snapshot_creator.cc index 1b6adf67b1..2124342209 100644 --- a/src/snapshot_creator.cc +++ b/src/snapshot_creator.cc @@ -42,30 +42,6 @@ v8::StartupData MakeSnapshot(const char* js_filename, const char* js_source) { return snapshot_blob; } -// Wrap the js_source in an IIFE to work around a bug in the V8 snapshot -// serializer. Without it, CreateBlob() triggers the following assert: -// Debug check failed : outer_scope_info()->IsScopeInfo() || is_toplevel(). -// ==== C stack trace ==== -// v8::internal::SharedFunctionInfo::FlushCompiled -// v8::SnapshotCreator::CreateBlob -// deno::MakeSnapshot -// Avoid misaligning the source map, and ensure that the sourceMappingUrl -// comment remains at the last line. -// Try removing this when this bug is fixed: -// https://bugs.chromium.org/p/v8/issues/detail?id=7857 -std::string WrapSourceCode(const std::string& js_source) { - auto smu_offset = js_source.rfind("//# sourceMappingURL="); - std::string tail = - smu_offset == std::string::npos ? "" : js_source.substr(smu_offset); - auto wrapped_js_source = - "(function() {" + js_source.substr(0, smu_offset) + "\n})();\n" + tail; - // Double check that the source mapping url comment is at the last line. - auto last_line = wrapped_js_source.substr(wrapped_js_source.rfind('\n')); - CHECK(smu_offset == std::string::npos || - last_line.find("sourceMappingURL") != std::string::npos); - return wrapped_js_source; -} - } // namespace deno int main(int argc, char** argv) { @@ -81,10 +57,8 @@ int main(int argc, char** argv) { std::string js_source; CHECK(deno::ReadFileToString(js_fn, &js_source)); - auto wrapped_js_source = deno::WrapSourceCode(js_source); - deno_init(); - auto snapshot_blob = deno::MakeSnapshot(js_fn, wrapped_js_source.c_str()); + auto snapshot_blob = deno::MakeSnapshot(js_fn, js_source.c_str()); std::string snapshot_str(snapshot_blob.data, snapshot_blob.raw_size); CHECK(deno::WriteDataAsCpp("snapshot", snapshot_out_cc, snapshot_str));