fix: Fix local confusion in builtin min/max/rotl/rotr (#1540)

Author: dcodeIO

package-lock.json

@@ -88,6 +88,7 @@ import {
 } from "./program";
 
 import {
+  findUsedLocals,
   FlowFlags,
   LocalFlags
 } from "./flow";
@@ -1185,7 +1186,7 @@ function builtin_rotl(ctx: BuiltinContext): ExpressionRef {
       case TypeKind.U16: {
         // (value << (shift & mask)) | (value >>> ((0 - shift) & mask))
         let flow = compiler.currentFlow;
-        let temp1 = flow.getTempLocal(type);
+        let temp1 = flow.getTempLocal(type, findUsedLocals(arg1));
         flow.setLocalFlag(temp1.index, LocalFlags.WRAPPED);
         let temp2 = flow.getTempLocal(type);
         flow.setLocalFlag(temp2.index, LocalFlags.WRAPPED);
@@ -1266,7 +1267,7 @@ function builtin_rotr(ctx: BuiltinContext): ExpressionRef {
       case TypeKind.U16: {
         // (value >>> (shift & mask)) | (value << ((0 - shift) & mask))
         let flow = compiler.currentFlow;
-        let temp1 = flow.getTempLocal(type);
+        let temp1 = flow.getTempLocal(type, findUsedLocals(arg1));
         flow.setLocalFlag(temp1.index, LocalFlags.WRAPPED);
         let temp2 = flow.getTempLocal(type);
         flow.setLocalFlag(temp2.index, LocalFlags.WRAPPED);
@@ -1484,7 +1485,7 @@ function builtin_max(ctx: BuiltinContext): ExpressionRef {
     if (op != -1) {
       let flow = compiler.currentFlow;
       let nativeType = type.toNativeType();
-      let temp1 = flow.getTempLocal(type);
+      let temp1 = flow.getTempLocal(type, findUsedLocals(arg1));
       flow.setLocalFlag(temp1.index, LocalFlags.WRAPPED);
       let temp2 = flow.getTempLocal(type);
       flow.setLocalFlag(temp2.index, LocalFlags.WRAPPED);
@@ -1563,7 +1564,7 @@ function builtin_min(ctx: BuiltinContext): ExpressionRef {
     if (op != -1) {
       let flow = compiler.currentFlow;
       let nativeType = type.toNativeType();
-      let temp1 = flow.getTempLocal(type);
+      let temp1 = flow.getTempLocal(type, findUsedLocals(arg1));
       flow.setLocalFlag(temp1.index, LocalFlags.WRAPPED);
       let temp2 = flow.getTempLocal(type);
       flow.setLocalFlag(temp2.index, LocalFlags.WRAPPED);

src/builtins.ts

@@ -561,3 +561,25 @@ assert(isInteger<ReturnType<() => i32>>());
 assert(isInteger<returnof<() => i32>>());
 assert(isManaged<returnof<() => C>>());
 assert(isManaged<ReturnType<() => C>>());
+
+// Issue #1537: Make sure temp. locals are not confused
+
+function max3(a: i32, b: i32, c: i32): i32 {
+  return max(a, max(b, c));
+}
+assert(max3(3, 2, 1) == 3);
+
+function min3(a: i32, b: i32, c: i32): i32 {
+  return min(a, min(b, c));
+}
+assert(min3(1, 2, 3) == 1);
+
+function rotl3(a: i8, b: i8, c: i8): i32 {
+  return rotl(a, rotl(b, c));
+}
+assert(rotl3(3, 2, 1) == 48);
+
+function rotr3(a: i8, b: i8, c: i8): i32 {
+  return rotr(a, rotr(b, c));
+}
+assert(rotr3(48, 8, 1) == 3);