summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/wasm-binary.h7
-rw-r--r--src/wasm-stack.h2
-rw-r--r--src/wasm/wasm-binary.cpp36
-rw-r--r--test/fib-dbg.wasm.fromBinary2
-rw-r--r--test/lit/source-map.wast46
5 files changed, 78 insertions, 15 deletions
diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index 4d9f4f5ae..a5b4202a0 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -1430,7 +1430,12 @@ class WasmBinaryBuilder {
MixedArena& allocator;
const std::vector<char>& input;
std::istream* sourceMap;
- std::pair<uint32_t, Function::DebugLocation> nextDebugLocation;
+ struct NextDebugLocation {
+ uint32_t availablePos;
+ uint32_t previousPos;
+ Function::DebugLocation next;
+ };
+ NextDebugLocation nextDebugLocation;
bool debugInfo = true;
bool DWARF = false;
bool skipFunctionBodies = false;
diff --git a/src/wasm-stack.h b/src/wasm-stack.h
index 8f72c1384..62fe053f4 100644
--- a/src/wasm-stack.h
+++ b/src/wasm-stack.h
@@ -232,7 +232,6 @@ void BinaryenIRWriter<SubType>::visitPossibleBlockContents(Expression* curr) {
template<typename SubType>
void BinaryenIRWriter<SubType>::visit(Expression* curr) {
- emitDebugLocation(curr);
// We emit unreachable instructions that create unreachability, but not
// unreachable instructions that just inherit unreachability from their
// children, since the latter won't be reached. This (together with logic in
@@ -257,6 +256,7 @@ void BinaryenIRWriter<SubType>::visit(Expression* curr) {
if (Properties::isControlFlowStructure(curr)) {
Visitor<BinaryenIRWriter>::visit(curr);
} else {
+ emitDebugLocation(curr);
emit(curr);
}
}
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index b616b5a31..bb6f082f8 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -1572,8 +1572,8 @@ void WasmBinaryWriter::writeField(const Field& field) {
WasmBinaryBuilder::WasmBinaryBuilder(Module& wasm,
FeatureSet features,
const std::vector<char>& input)
- : wasm(wasm), allocator(wasm.allocator), input(input), sourceMap(nullptr),
- nextDebugLocation(0, {0, 0, 0}), debugLocation() {
+ : wasm(wasm), allocator(wasm.allocator), input(input),
+ sourceMap(nullptr), nextDebugLocation{0, 0, {0, 0, 0}}, debugLocation() {
wasm.features = features;
}
@@ -2741,7 +2741,7 @@ void WasmBinaryBuilder::readSourceMapHeader() {
mustReadChar('\"');
if (maybeReadChar('\"')) { // empty mappings
- nextDebugLocation.first = 0;
+ nextDebugLocation.availablePos = 0;
return;
}
// read first debug location
@@ -2750,7 +2750,8 @@ void WasmBinaryBuilder::readSourceMapHeader() {
uint32_t lineNumber =
readBase64VLQ(*sourceMap) + 1; // adjust zero-based line number
uint32_t columnNumber = readBase64VLQ(*sourceMap);
- nextDebugLocation = {position, {fileIndex, lineNumber, columnNumber}};
+ nextDebugLocation = {
+ position, position, {fileIndex, lineNumber, columnNumber}};
}
void WasmBinaryBuilder::readNextDebugLocation() {
@@ -2758,17 +2759,26 @@ void WasmBinaryBuilder::readNextDebugLocation() {
return;
}
- while (nextDebugLocation.first && nextDebugLocation.first <= pos) {
+ if (nextDebugLocation.availablePos == 0 &&
+ nextDebugLocation.previousPos <= pos) {
+ // if source map file had already reached the end and cache position also
+ // cannot cover the pos clear the debug location
+ debugLocation.clear();
+ return;
+ }
+
+ while (nextDebugLocation.availablePos &&
+ nextDebugLocation.availablePos <= pos) {
debugLocation.clear();
// use debugLocation only for function expressions
if (currFunction) {
- debugLocation.insert(nextDebugLocation.second);
+ debugLocation.insert(nextDebugLocation.next);
}
char ch;
*sourceMap >> ch;
if (ch == '\"') { // end of records
- nextDebugLocation.first = 0;
+ nextDebugLocation.availablePos = 0;
break;
}
if (ch != ',') {
@@ -2776,16 +2786,18 @@ void WasmBinaryBuilder::readNextDebugLocation() {
}
int32_t positionDelta = readBase64VLQ(*sourceMap);
- uint32_t position = nextDebugLocation.first + positionDelta;
+ uint32_t position = nextDebugLocation.availablePos + positionDelta;
int32_t fileIndexDelta = readBase64VLQ(*sourceMap);
- uint32_t fileIndex = nextDebugLocation.second.fileIndex + fileIndexDelta;
+ uint32_t fileIndex = nextDebugLocation.next.fileIndex + fileIndexDelta;
int32_t lineNumberDelta = readBase64VLQ(*sourceMap);
- uint32_t lineNumber = nextDebugLocation.second.lineNumber + lineNumberDelta;
+ uint32_t lineNumber = nextDebugLocation.next.lineNumber + lineNumberDelta;
int32_t columnNumberDelta = readBase64VLQ(*sourceMap);
uint32_t columnNumber =
- nextDebugLocation.second.columnNumber + columnNumberDelta;
+ nextDebugLocation.next.columnNumber + columnNumberDelta;
- nextDebugLocation = {position, {fileIndex, lineNumber, columnNumber}};
+ nextDebugLocation = {position,
+ nextDebugLocation.availablePos,
+ {fileIndex, lineNumber, columnNumber}};
}
}
diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary
index 8db3246ad..8abbef764 100644
--- a/test/fib-dbg.wasm.fromBinary
+++ b/test/fib-dbg.wasm.fromBinary
@@ -204,8 +204,8 @@
(br $label$4)
)
)
- ;;@ fib.c:8:0
(return
+ ;;@ fib.c:8:0
(local.get $4)
)
)
diff --git a/test/lit/source-map.wast b/test/lit/source-map.wast
new file mode 100644
index 000000000..a0e969c23
--- /dev/null
+++ b/test/lit/source-map.wast
@@ -0,0 +1,46 @@
+;; RUN: wasm-opt %s -o %t.wasm -osm %t.map -g -q
+;; RUN: wasm-opt %t.wasm -ism %t.map -q -o - -S | filecheck %s
+
+(module
+ (func $foo (param $x i32) (param $y i32)
+ ;;@ src.cpp:10:1
+ (if
+ ;;@ src.cpp:20:1
+ (i32.add
+ ;;@ src.cpp:30:1
+ (local.get $x)
+ ;;@ src.cpp:40:1
+ (local.get $y)
+ )
+ ;;@ src.cpp:50:1
+ (return)
+ )
+ ;;@ src.cpp:60:1
+ (call $foo
+ ;;@ src.cpp:70:1
+ (local.get $x)
+ ;;@ src.cpp:80:1
+ (local.get $y)
+ )
+ )
+)
+
+;; CHECK: (func $foo (param $x i32) (param $y i32)
+;; CHECK-NEXT: ;;@ src.cpp:20:1
+;; CHECK-NEXT: (if
+;; CHECK-NEXT: (i32.add
+;; CHECK-NEXT: ;;@ src.cpp:30:1
+;; CHECK-NEXT: (local.get $x)
+;; CHECK-NEXT: ;;@ src.cpp:40:1
+;; CHECK-NEXT: (local.get $y)
+;; CHECK-NEXT: )
+;; CHECK-NEXT: ;;@ src.cpp:50:1
+;; CHECK-NEXT: (return)
+;; CHECK-NEXT: )
+;; CHECK-NEXT: ;;@ src.cpp:60:1
+;; CHECK-NEXT: (call $foo
+;; CHECK-NEXT: ;;@ src.cpp:70:1
+;; CHECK-NEXT: (local.get $x)
+;; CHECK-NEXT: ;;@ src.cpp:80:1
+;; CHECK-NEXT: (local.get $y)
+;; CHECK-NEXT: )
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-07 16:43:49 +0000