From 24792b1e5cdef03cefafc8139aea437258de9622 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcong.cai@bmw.com>
Date: Wed, 27 Sep 2023 14:37:10 +0800
Subject: [PATCH 1/2] fix: rest parameter crash resolver

---
 src/resolver.ts                        |  2 +-
 tests/compiler/issues/2707.debug.wat   | 16 ++++++++++++++++
 tests/compiler/issues/2707.json        |  3 +++
 tests/compiler/issues/2707.release.wat |  6 ++++++
 tests/compiler/issues/2707.ts          |  4 ++++
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tests/compiler/issues/2707.debug.wat
 create mode 100644 tests/compiler/issues/2707.json
 create mode 100644 tests/compiler/issues/2707.release.wat
 create mode 100644 tests/compiler/issues/2707.ts

diff --git a/src/resolver.ts b/src/resolver.ts
index e3e389d331..b78287d9aa 100644
--- a/src/resolver.ts
+++ b/src/resolver.ts
@@ -392,7 +392,7 @@ export class Resolver extends DiagnosticEmitter {
           break;
         }
         case ParameterKind.Rest: {
-          assert(i == numParameters);
+          assert(i == numParameters - 1);
           hasRest = true;
           break;
         }
diff --git a/tests/compiler/issues/2707.debug.wat b/tests/compiler/issues/2707.debug.wat
new file mode 100644
index 0000000000..c9fcb09960
--- /dev/null
+++ b/tests/compiler/issues/2707.debug.wat
@@ -0,0 +1,16 @@
+(module
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (global $issues/2707/func (mut i32) (i32.const 32))
+ (global $~lib/memory/__data_end i32 (i32.const 44))
+ (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32812))
+ (global $~lib/memory/__heap_base i32 (i32.const 32812))
+ (memory $0 1)
+ (data $0 (i32.const 12) "\1c\00\00\00\00\00\00\00\00\00\00\00\05\00\00\00\08\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00")
+ (table $0 2 2 funcref)
+ (elem $0 (i32.const 1) $start:issues/2707~anonymous|0)
+ (export "memory" (memory $0))
+ (func $start:issues/2707~anonymous|0 (param $args i32) (result i32)
+  i32.const 1
+  return
+ )
+)
diff --git a/tests/compiler/issues/2707.json b/tests/compiler/issues/2707.json
new file mode 100644
index 0000000000..ea57a955e1
--- /dev/null
+++ b/tests/compiler/issues/2707.json
@@ -0,0 +1,3 @@
+{
+  "asc_flags": []
+}
diff --git a/tests/compiler/issues/2707.release.wat b/tests/compiler/issues/2707.release.wat
new file mode 100644
index 0000000000..712448c7ea
--- /dev/null
+++ b/tests/compiler/issues/2707.release.wat
@@ -0,0 +1,6 @@
+(module
+ (memory $0 1)
+ (data $0 (i32.const 1036) "\1c")
+ (data $0.1 (i32.const 1048) "\05\00\00\00\08\00\00\00\01")
+ (export "memory" (memory $0))
+)
diff --git a/tests/compiler/issues/2707.ts b/tests/compiler/issues/2707.ts
new file mode 100644
index 0000000000..855cd8793d
--- /dev/null
+++ b/tests/compiler/issues/2707.ts
@@ -0,0 +1,4 @@
+// should not crash
+let func: (...args: i32[]) => i32 = (...args: i32[]) => {
+  return 1;
+};

From d4e40d4c93cb7093ff83537b47df8e770e4563e3 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcong.cai@bmw.com>
Date: Tue, 3 Oct 2023 08:37:39 +0800
Subject: [PATCH 2/2] update test

---
 tests/compiler/issues/2707.debug.wat   | 16 ----------------
 tests/compiler/issues/2707.json        |  6 +++++-
 tests/compiler/issues/2707.release.wat |  6 ------
 tests/compiler/issues/2707.ts          |  2 ++
 4 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 tests/compiler/issues/2707.debug.wat
 delete mode 100644 tests/compiler/issues/2707.release.wat

diff --git a/tests/compiler/issues/2707.debug.wat b/tests/compiler/issues/2707.debug.wat
deleted file mode 100644
index c9fcb09960..0000000000
--- a/tests/compiler/issues/2707.debug.wat
+++ /dev/null
@@ -1,16 +0,0 @@
-(module
- (type $i32_=>_i32 (func (param i32) (result i32)))
- (global $issues/2707/func (mut i32) (i32.const 32))
- (global $~lib/memory/__data_end i32 (i32.const 44))
- (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32812))
- (global $~lib/memory/__heap_base i32 (i32.const 32812))
- (memory $0 1)
- (data $0 (i32.const 12) "\1c\00\00\00\00\00\00\00\00\00\00\00\05\00\00\00\08\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00")
- (table $0 2 2 funcref)
- (elem $0 (i32.const 1) $start:issues/2707~anonymous|0)
- (export "memory" (memory $0))
- (func $start:issues/2707~anonymous|0 (param $args i32) (result i32)
-  i32.const 1
-  return
- )
-)
diff --git a/tests/compiler/issues/2707.json b/tests/compiler/issues/2707.json
index ea57a955e1..5d2bf93db3 100644
--- a/tests/compiler/issues/2707.json
+++ b/tests/compiler/issues/2707.json
@@ -1,3 +1,7 @@
 {
-  "asc_flags": []
+  "asc_flags": [],
+  "stderr": [
+    "AS100: Not implemented: Rest parameters",
+    "func(1, 2, 3, 4);"
+  ]
 }
diff --git a/tests/compiler/issues/2707.release.wat b/tests/compiler/issues/2707.release.wat
deleted file mode 100644
index 712448c7ea..0000000000
--- a/tests/compiler/issues/2707.release.wat
+++ /dev/null
@@ -1,6 +0,0 @@
-(module
- (memory $0 1)
- (data $0 (i32.const 1036) "\1c")
- (data $0.1 (i32.const 1048) "\05\00\00\00\08\00\00\00\01")
- (export "memory" (memory $0))
-)
diff --git a/tests/compiler/issues/2707.ts b/tests/compiler/issues/2707.ts
index 855cd8793d..dc380b73d6 100644
--- a/tests/compiler/issues/2707.ts
+++ b/tests/compiler/issues/2707.ts
@@ -2,3 +2,5 @@
 let func: (...args: i32[]) => i32 = (...args: i32[]) => {
   return 1;
 };
+
+func(1, 2, 3, 4);