Skip to content

Handle single-segment source mapping in source map header decoder #6794

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.

Sign up for GitHub

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

Merged
kripken merged 6 commits into from
Aug 6, 2024
Merged

Handle single-segment source mapping in source map header decoder #6794

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc6dd69
Handle single-segment source mapping in source map header decoder
osa1 Jul 31, 2024
3214f8a
Add a unit test
osa1 Aug 1, 2024
ff0e62a
Fix formatting
osa1 Aug 1, 2024
3445d0e
Update test
osa1 Aug 6, 2024
cc29a5f
Fix lint
osa1 Aug 6, 2024
2833da7
Update test/gtest/binary-reader.cpp
kripken Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/wasm/wasm-binary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2939,13 +2939,20 @@ void WasmBinaryReader::readSourceMapHeader() {
// investigation (if it does, it will assert in readBase64VLQ, so it
// would not be a silent error at least).
uint32_t position = readBase64VLQ(*sourceMap);
uint32_t fileIndex = readBase64VLQ(*sourceMap);
uint32_t lineNumber =
readBase64VLQ(*sourceMap) + 1; // adjust zero-based line number
uint32_t columnNumber = readBase64VLQ(*sourceMap);
nextDebugPos = position;
nextDebugLocation = {fileIndex, lineNumber, columnNumber};
nextDebugLocationHasDebugInfo = true;

auto peek = sourceMap->peek();
if (peek == ',' || peek == '\"') {
// This is a 1-length entry, so the next location has no debug info.
nextDebugLocationHasDebugInfo = false;
} else {
uint32_t fileIndex = readBase64VLQ(*sourceMap);
uint32_t lineNumber =
readBase64VLQ(*sourceMap) + 1; // adjust zero-based line number
uint32_t columnNumber = readBase64VLQ(*sourceMap);
nextDebugLocation = {fileIndex, lineNumber, columnNumber};
nextDebugLocationHasDebugInfo = true;
}
}

void WasmBinaryReader::readNextDebugLocation() {
Expand Down