summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <azakai@google.com>2019-05-17 13:06:41 -0700
committerGitHub <noreply@github.com>2019-05-17 13:06:41 -0700
commit07ccba5e3cbcc9ff3e36692d184fcaa15318f304 (patch)
tree1ea0efad9bd888759c2d1603e3fab5af85217d57
parentd8c46cf57840eadc3d59ef8bffb2d1b3d4438daf (diff)
downloadbinaryen-07ccba5e3cbcc9ff3e36692d184fcaa15318f304.tar.gz
binaryen-07ccba5e3cbcc9ff3e36692d184fcaa15318f304.tar.bz2
binaryen-07ccba5e3cbcc9ff3e36692d184fcaa15318f304.zip
fix a dae fuzz bug (#2121)
-rw-r--r--src/passes/DeadArgumentElimination.cpp2
-rw-r--r--test/passes/dae-optimizing.txt43
-rw-r--r--test/passes/dae-optimizing.wast60
3 files changed, 105 insertions, 0 deletions
diff --git a/src/passes/DeadArgumentElimination.cpp b/src/passes/DeadArgumentElimination.cpp
index 3735c79d0..ab2e8e5e3 100644
--- a/src/passes/DeadArgumentElimination.cpp
+++ b/src/passes/DeadArgumentElimination.cpp
@@ -217,6 +217,8 @@ struct DAE : public Pass {
}
bool iteration(PassRunner* runner, Module* module) {
+ allDroppedCalls.clear();
+
DAEFunctionInfoMap infoMap;
// Ensure they all exist so the parallel threads don't modify the data
// structure.
diff --git a/test/passes/dae-optimizing.txt b/test/passes/dae-optimizing.txt
new file mode 100644
index 000000000..ddc82d7f3
--- /dev/null
+++ b/test/passes/dae-optimizing.txt
@@ -0,0 +1,43 @@
+(module
+ (type $0 (func (param f32) (result f32)))
+ (type $1 (func (param f64 f32 f32 f64 f32 i64 f64) (result i32)))
+ (type $2 (func (param f64 f32 f32 f64 f32 i32 i32 f64) (result i32)))
+ (global $global$0 (mut i32) (i32.const 10))
+ (func $0 (; 0 ;) (result i32)
+ (local $0 i32)
+ (local $1 i32)
+ (drop
+ (if (result f32)
+ (local.tee $0
+ (i32.const 33554432)
+ )
+ (loop $label$2 (result f32)
+ (if
+ (global.get $global$0)
+ (return
+ (local.get $0)
+ )
+ )
+ (local.set $0
+ (local.get $1)
+ )
+ (local.set $1
+ (i32.const 0)
+ )
+ (br_if $label$2
+ (local.get $0)
+ )
+ (f32.const 1)
+ )
+ (call $1)
+ )
+ )
+ (i32.const -11)
+ )
+ (func $1 (; 1 ;) (result f32)
+ (f32.const 0)
+ )
+ (func $2 (; 2 ;) (type $2) (param $0 f64) (param $1 f32) (param $2 f32) (param $3 f64) (param $4 f32) (param $5 i32) (param $6 i32) (param $7 f64) (result i32)
+ (call $0)
+ )
+)
diff --git a/test/passes/dae-optimizing.wast b/test/passes/dae-optimizing.wast
new file mode 100644
index 000000000..5d51cf29d
--- /dev/null
+++ b/test/passes/dae-optimizing.wast
@@ -0,0 +1,60 @@
+(module
+ (type $0 (func (param f32) (result f32)))
+ (type $1 (func (param f64 f32 f32 f64 f32 i64 f64) (result i32)))
+ (type $2 (func (param f64 f32 f32 f64 f32 i32 i32 f64) (result i32)))
+ (global $global$0 (mut i32) (i32.const 10))
+ (func $0 (; 0 ;) (type $1) (param $0 f64) (param $1 f32) (param $2 f32) (param $3 f64) (param $4 f32) (param $5 i64) (param $6 f64) (result i32)
+ (local $7 i32)
+ (local $8 i32)
+ (if
+ (local.tee $7
+ (i32.const 33554432)
+ )
+ (drop
+ (loop $label$2 (result f32)
+ (if
+ (global.get $global$0)
+ (return
+ (local.get $7)
+ )
+ )
+ (local.set $8
+ (block $label$4 (result i32)
+ (drop
+ (local.tee $7
+ (local.get $8)
+ )
+ )
+ (i32.const 0)
+ )
+ )
+ (br_if $label$2
+ (local.get $7)
+ )
+ (f32.const 1)
+ )
+ )
+ (drop
+ (call $1
+ (f32.const 1)
+ )
+ )
+ )
+ (i32.const -11)
+ )
+ (func $1 (; 1 ;) (type $0) (param $0 f32) (result f32)
+ (f32.const 0)
+ )
+ (func $2 (; 2 ;) (type $2) (param $0 f64) (param $1 f32) (param $2 f32) (param $3 f64) (param $4 f32) (param $5 i32) (param $6 i32) (param $7 f64) (result i32)
+ (call $0
+ (f64.const 1)
+ (f32.const 1)
+ (f32.const 1)
+ (f64.const 1)
+ (f32.const 1)
+ (i64.const 1)
+ (f64.const 1)
+ )
+ )
+)
+