summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/passes/I64ToI32Lowering.cpp3
-rw-r--r--src/passes/LogExecution.cpp3
-rw-r--r--src/tools/wasm-reduce.cpp10
-rw-r--r--src/wasm/wasm-emscripten.cpp3
-rw-r--r--test/passes/i64-to-i32-lowering.txt62
-rw-r--r--test/passes/i64-to-i32-lowering.wast7
-rw-r--r--test/passes/log-execution.txt13
-rw-r--r--test/passes/log-execution.wast1
-rw-r--r--test/reduce/imports.wast17
-rw-r--r--test/reduce/imports.wast.txt6
10 files changed, 115 insertions, 10 deletions
diff --git a/src/passes/I64ToI32Lowering.cpp b/src/passes/I64ToI32Lowering.cpp
index 697df1eef..9e6fd106b 100644
--- a/src/passes/I64ToI32Lowering.cpp
+++ b/src/passes/I64ToI32Lowering.cpp
@@ -175,6 +175,9 @@ struct I64ToI32Lowering : public WalkerPass<PostWalker<I64ToI32Lowering>> {
}
void visitFunction(Function* func) {
+ if (func->imported()) {
+ return;
+ }
if (func->result == i64) {
func->result = i32;
// body may not have out param if it ends with control flow
diff --git a/src/passes/LogExecution.cpp b/src/passes/LogExecution.cpp
index 45a29eae9..65a802a2f 100644
--- a/src/passes/LogExecution.cpp
+++ b/src/passes/LogExecution.cpp
@@ -42,6 +42,9 @@ struct LogExecution : public WalkerPass<PostWalker<LogExecution>> {
}
void visitFunction(Function* curr) {
+ if (curr->imported()) {
+ return;
+ }
curr->body = makeLogCall(curr->body);
}
diff --git a/src/tools/wasm-reduce.cpp b/src/tools/wasm-reduce.cpp
index f31c11edd..bee6ba621 100644
--- a/src/tools/wasm-reduce.cpp
+++ b/src/tools/wasm-reduce.cpp
@@ -524,9 +524,11 @@ struct Reducer : public WalkerPass<PostWalker<Reducer, UnifiedExpressionVisitor<
}
void visitFunction(Function* curr) {
- // extra chance to work on the function toplevel element, as if it can
- // be reduced it's great
- visitExpression(curr->body);
+ if (!curr->imported()) {
+ // extra chance to work on the function toplevel element, as if it can
+ // be reduced it's great
+ visitExpression(curr->body);
+ }
// finish function
funcsSeen++;
static int last = 0;
@@ -677,7 +679,7 @@ struct Reducer : public WalkerPass<PostWalker<Reducer, UnifiedExpressionVisitor<
if (module->functions.size() == 1 && module->exports.empty() && module->table.segments.empty()) {
auto* func = module->functions[0].get();
// We can't remove something that might have breaks to it.
- if (!Properties::isNamedControlFlow(func->body)) {
+ if (!func->imported() && !Properties::isNamedControlFlow(func->body)) {
auto funcType = func->type;
auto funcResult = func->result;
auto* funcBody = func->body;
diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp
index 6667ac855..78d2d25c6 100644
--- a/src/wasm/wasm-emscripten.cpp
+++ b/src/wasm/wasm-emscripten.cpp
@@ -489,6 +489,9 @@ struct EmJsWalker : public PostWalker<EmJsWalker> {
segmentOffsets(getSegmentOffsets(wasm)) { }
void visitFunction(Function* curr) {
+ if (curr->imported()) {
+ return;
+ }
if (!curr->name.startsWith(EM_JS_PREFIX.str)) {
return;
}
diff --git a/test/passes/i64-to-i32-lowering.txt b/test/passes/i64-to-i32-lowering.txt
new file mode 100644
index 000000000..5d5dbe850
--- /dev/null
+++ b/test/passes/i64-to-i32-lowering.txt
@@ -0,0 +1,62 @@
+(module
+ (type $FUNCSIG$j (func (result i32)))
+ (import "env" "func" (func $import (result i32)))
+ (global $i64toi32_i32$HIGH_BITS (mut i32) (i32.const 0))
+ (func $defined (; 1 ;) (type $FUNCSIG$j) (result i32)
+ (local $i64toi32_i32$0 i32)
+ (local $i64toi32_i32$1 i32)
+ (local $i64toi32_i32$2 i32)
+ (local $i64toi32_i32$3 i32)
+ (local $i64toi32_i32$4 i32)
+ (local $i64toi32_i32$5 i32)
+ (set_local $i64toi32_i32$2
+ (block (result i32)
+ (set_local $i64toi32_i32$2
+ (block (result i32)
+ (set_local $i64toi32_i32$0
+ (i32.const 0)
+ )
+ (i32.const 1)
+ )
+ )
+ (set_local $i64toi32_i32$3
+ (block (result i32)
+ (set_local $i64toi32_i32$1
+ (i32.const 0)
+ )
+ (i32.const 2)
+ )
+ )
+ (set_local $i64toi32_i32$4
+ (i32.add
+ (get_local $i64toi32_i32$2)
+ (get_local $i64toi32_i32$3)
+ )
+ )
+ (set_local $i64toi32_i32$5
+ (i32.add
+ (get_local $i64toi32_i32$0)
+ (get_local $i64toi32_i32$1)
+ )
+ )
+ (if
+ (i32.lt_u
+ (get_local $i64toi32_i32$4)
+ (get_local $i64toi32_i32$3)
+ )
+ (set_local $i64toi32_i32$5
+ (i32.add
+ (get_local $i64toi32_i32$5)
+ (i32.const 1)
+ )
+ )
+ )
+ (get_local $i64toi32_i32$4)
+ )
+ )
+ (set_global $i64toi32_i32$HIGH_BITS
+ (get_local $i64toi32_i32$5)
+ )
+ (get_local $i64toi32_i32$2)
+ )
+)
diff --git a/test/passes/i64-to-i32-lowering.wast b/test/passes/i64-to-i32-lowering.wast
new file mode 100644
index 000000000..179cac467
--- /dev/null
+++ b/test/passes/i64-to-i32-lowering.wast
@@ -0,0 +1,7 @@
+(module
+ (import "env" "func" (func $import (result i64)))
+ (func $defined (result i64)
+ (i64.add (i64.const 1) (i64.const 2))
+ )
+)
+
diff --git a/test/passes/log-execution.txt b/test/passes/log-execution.txt
index f09346a31..3f842a6f1 100644
--- a/test/passes/log-execution.txt
+++ b/test/passes/log-execution.txt
@@ -1,21 +1,22 @@
(module
- (type $0 (func))
+ (type $FUNCSIG$v (func))
(type $1 (func (result i32)))
(type $FUNCSIG$vi (func (param i32)))
+ (import "env" "func" (func $import))
(import "env" "log_execution" (func $log_execution (param i32)))
- (func $nopp (; 1 ;) (type $0)
+ (func $nopp (; 2 ;) (type $FUNCSIG$v)
(call $log_execution
(i32.const 0)
)
(nop)
)
- (func $intt (; 2 ;) (type $1) (result i32)
+ (func $intt (; 3 ;) (type $1) (result i32)
(call $log_execution
(i32.const 1)
)
(i32.const 10)
)
- (func $workk (; 3 ;) (type $0)
+ (func $workk (; 4 ;) (type $FUNCSIG$v)
(call $log_execution
(i32.const 2)
)
@@ -29,7 +30,7 @@
)
)
)
- (func $loops (; 4 ;) (type $0)
+ (func $loops (; 5 ;) (type $FUNCSIG$v)
(call $log_execution
(i32.const 6)
)
@@ -70,7 +71,7 @@
)
)
)
- (func $loops-similar (; 5 ;) (type $0)
+ (func $loops-similar (; 6 ;) (type $FUNCSIG$v)
(call $log_execution
(i32.const 8)
)
diff --git a/test/passes/log-execution.wast b/test/passes/log-execution.wast
index 12175fbcb..f7448408a 100644
--- a/test/passes/log-execution.wast
+++ b/test/passes/log-execution.wast
@@ -1,4 +1,5 @@
(module
+ (import "env" "func" (func $import))
(func $nopp
(nop)
)
diff --git a/test/reduce/imports.wast b/test/reduce/imports.wast
new file mode 100644
index 000000000..2eb37a066
--- /dev/null
+++ b/test/reduce/imports.wast
@@ -0,0 +1,17 @@
+(module
+ (import "env" "func" (func $import))
+ (export "x" (func $x))
+ (func $x (result i32)
+ (nop)
+ (nop)
+ (nop)
+ (call $import)
+ (drop (i32.const 1234))
+ (i32.const 5678) ;; easily reducible
+ )
+ (func $not-exported
+ (nop)
+ (unreachable)
+ )
+)
+
diff --git a/test/reduce/imports.wast.txt b/test/reduce/imports.wast.txt
new file mode 100644
index 000000000..220bf3b7e
--- /dev/null
+++ b/test/reduce/imports.wast.txt
@@ -0,0 +1,6 @@
+(module
+ (type $0 (func))
+ (type $1 (func (result i32)))
+ (import "env" "func" (func $fimport$0))
+)
+
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-05 15:50:58 +0000