language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-10-01 22:51:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix snapshot source code wrapping.

Browse source
This commit is contained in:
Ryan Dahl 2018-06-19 17:45:58 +02:00
parent 7a38a2f1a7
commit b2b4054f97
2 changed files with 45 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

41
deno2/snapshot_creator.cc
View file

@ -42,6 +42,30 @@ 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) {
@ -57,22 +81,7 @@ int main(int argc, char** argv) {
std::string js_source;
CHECK(deno::ReadFileToString(js_fn, &js_source));
// 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.
auto smu_offset = js_source.rfind("//#");
CHECK(smu_offset != std::string::npos);
auto wrapped_js_source = "(function() {" + js_source.substr(0, smu_offset) +
"\n})();\n" + js_source.substr(smu_offset);
// 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(last_line.find("sourceMappingURL") != std::string::npos);
auto wrapped_js_source = deno::WrapSourceCode(js_source);
deno_init();
auto snapshot_blob = deno::MakeSnapshot(js_fn, wrapped_js_source.c_str());