fix(stdlib): Make toNumber functions respect Number invariants (#1347)

grain-lang · Jun 28, 2022 · 78db882 · 78db882
1 parent f640ec2
commit 78db882
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 18 deletions.
diff --git a/compiler/test/stdlib/bigint.test.gr b/compiler/test/stdlib/bigint.test.gr
@@ -205,6 +205,10 @@ assert eq(
 let (==) = equals
 let (+) = origAdd
 
+// Regression #1339
+let arr = [> 1, 2, 3]
+assert arr[toNumber(1t)] == 2
+
 // Tests generated with https://gist.github.com/peblair/b5a463a03e40bc870a80869eea148b4b
 // BEGIN RANDOMLY GENERATED TESTS
 //print("Running random test suite (30 tests per category)")

diff --git a/compiler/test/stdlib/int32.test.gr b/compiler/test/stdlib/int32.test.gr
@@ -64,3 +64,7 @@ assert ne(5l, 55l)
 assert !ne(5l, 5l)
 assert eqz(0l)
 assert !eqz(-42l)
+
+// Regression #1339
+let arr = [> 1, 2, 3]
+assert arr[toNumber(1l)] == 2
diff --git a/compiler/test/stdlib/int64.test.gr b/compiler/test/stdlib/int64.test.gr
@@ -63,3 +63,7 @@ assert ne(5L, 55L)
 assert !ne(5L, 5L)
 assert eqz(0L)
 assert !eqz(-42L)
+
+// Regression #1339
+let arr = [> 1, 2, 3]
+assert arr[toNumber(1L)] == 2
diff --git a/stdlib/runtime/numbers.gr b/stdlib/runtime/numbers.gr
@@ -2070,42 +2070,48 @@ export let coerceNumberToFloat64 = (x: Number) => {
 
 @unsafe
 export let coerceInt32ToNumber = (x: Int32) => {
-  let x = WasmI32.fromGrain(x)
-  // incRef x to reuse it via WasmI32.toGrain
-  Memory.incRef(x)
-  WasmI32.toGrain(x): Number
+  WasmI32.toGrain(
+    reducedInteger(WasmI64.extendI32S(boxedInt32Number(WasmI32.fromGrain(x))))
+  ): Number
 }
 
 @unsafe
 export let coerceInt64ToNumber = (x: Int64) => {
-  let x = WasmI32.fromGrain(x)
-  // incRef x to reuse it via WasmI32.toGrain
-  Memory.incRef(x)
-  WasmI32.toGrain(x): Number
+  WasmI32.toGrain(
+    reducedInteger(boxedInt64Number(WasmI32.fromGrain(x)))
+  ): Number
 }
 
 @unsafe
 export let coerceBigIntToNumber = (x: BigInt) => {
   let x = WasmI32.fromGrain(x)
-  // incRef x to reuse it via WasmI32.toGrain
+  // reducedBigInteger assumes that the bigint is dead,
+  // but in our case, it is not
   Memory.incRef(x)
-  WasmI32.toGrain(x): Number
+  WasmI32.toGrain(reducedBigInteger(x)): Number
 }
 
 @unsafe
 export let coerceRationalToNumber = (x: Rational) => {
-  let x = WasmI32.fromGrain(x)
-  // incRef x to reuse it via WasmI32.toGrain
-  Memory.incRef(x)
-  WasmI32.toGrain(x): Number
+  if (WasmI32.eq(boxedRationalDenominator(WasmI32.fromGrain(x)), 1n)) {
+    WasmI32.toGrain(
+      reducedInteger(
+        WasmI64.extendI32S(boxedRationalNumerator(WasmI32.fromGrain(x)))
+      )
+    ): Number
+  } else {
+    let x = WasmI32.fromGrain(x)
+    // incRef x to reuse it via WasmI32.toGrain
+    Memory.incRef(x)
+    WasmI32.toGrain(x): Number
+  }
 }
 
 @unsafe
 export let coerceFloat32ToNumber = (x: Float32) => {
-  let x = WasmI32.fromGrain(x)
-  // incRef x to reuse it via WasmI32.toGrain
-  Memory.incRef(x)
-  WasmI32.toGrain(x): Number
+  WasmI32.toGrain(
+    newFloat64(WasmF64.promoteF32(boxedFloat32Number(WasmI32.fromGrain(x))))
+  ): Number
 }
 
 @unsafe