fix: Types of small integer constants should always set a current type (#2132)

Author: MaxGraey

src/compiler.ts

@@ -3392,14 +3392,8 @@ export class Compiler extends DiagnosticEmitter {
   ): ExpressionRef {
     assert(element.is(CommonFlags.INLINED | CommonFlags.RESOLVED));
     var type = element.type;
-    switch (
-      !(constraints & (Constraints.CONV_IMPLICIT | Constraints.CONV_EXPLICIT)) &&
-      type.isIntegerValue &&
-      contextualType.isIntegerValue &&
-      type.size < contextualType.size
-        ? (this.currentType = contextualType).kind // essentially precomputes a (sign-)extension
-        : (this.currentType = type).kind
-    ) {
+    this.currentType = type;
+    switch (type.kind) {
       case TypeKind.I8:
       case TypeKind.I16: {
         let shift = type.computeSmallIntegerShift(Type.i32);

tests/compiler/binary.untouched.wat

@@ -722,10 +722,12 @@
    local.set $11
    local.get $11
    i64.const 52
-   i64.const 7
+   i32.const 7
+   i64.extend_i32_s
    i64.sub
    i64.shr_u
-   i64.const 127
+   i32.const 127
+   i64.extend_i32_s
    i64.and
    i32.wrap_i64
    local.set $12
@@ -1048,7 +1050,8 @@
     f64.add
     local.set $28
     local.get $14
-    i64.const 127
+    i32.const 127
+    i64.extend_i32_s
     i64.and
     i64.const 1
     i64.shl
@@ -1059,7 +1062,8 @@
     i64.extend_i32_u
     i64.add
     i64.const 52
-    i64.const 7
+    i32.const 7
+    i64.extend_i32_s
     i64.sub
     i64.shl
     local.set $13
@@ -2049,7 +2053,8 @@
    i64.extend_i32_u
    i64.add
    i64.const 52
-   i64.const 5
+   i32.const 5
+   i64.extend_i32_s
    i64.sub
    i64.shl
    i64.add

tests/compiler/call-super.untouched.wat

@@ -1536,7 +1536,8 @@
     drop
     global.get $~lib/rt/itcms/total
     i64.extend_i32_u
-    i64.const 200
+    i32.const 200
+    i64.extend_i32_u
     i64.mul
     i64.const 100
     i64.div_u

tests/compiler/class-implements.untouched.wat

@@ -1546,7 +1546,8 @@
     drop
     global.get $~lib/rt/itcms/total
     i64.extend_i32_u
-    i64.const 200
+    i32.const 200
+    i64.extend_i32_u
     i64.mul
     i64.const 100
     i64.div_u

tests/compiler/class-overloading-cast.untouched.wat

@@ -1546,7 +1546,8 @@
     drop
     global.get $~lib/rt/itcms/total
     i64.extend_i32_u
-    i64.const 200
+    i32.const 200
+    i64.extend_i32_u
     i64.mul
     i64.const 100
     i64.div_u

tests/compiler/class-overloading.untouched.wat

@@ -1552,7 +1552,8 @@
     drop
     global.get $~lib/rt/itcms/total
     i64.extend_i32_u
-    i64.const 200
+    i32.const 200
+    i64.extend_i32_u
     i64.mul
     i64.const 100
     i64.div_u

tests/compiler/class.untouched.wat

@@ -1649,7 +1649,8 @@
     drop
     global.get $~lib/rt/itcms/total
     i64.extend_i32_u
-    i64.const 200
+    i32.const 200
+    i64.extend_i32_u
     i64.mul
     i64.const 100
     i64.div_u

tests/compiler/constructor.untouched.wat

@@ -1548,7 +1548,8 @@
     drop
     global.get $~lib/rt/itcms/total
     i64.extend_i32_u
-    i64.const 200
+    i32.const 200
+    i64.extend_i32_u
     i64.mul
     i64.const 100
     i64.div_u

tests/compiler/do.untouched.wat

@@ -1945,7 +1945,8 @@
     drop
     global.get $~lib/rt/itcms/total
     i64.extend_i32_u
-    i64.const 200
+    i32.const 200
+    i64.extend_i32_u
     i64.mul
     i64.const 100
     i64.div_u
@@ -2928,7 +2929,8 @@
   end
   global.get $~lib/rt/itcms/total
   i64.extend_i32_u
-  i64.const 200
+  i32.const 200
+  i64.extend_i32_u
   i64.mul
   i64.const 100
   i64.div_u

tests/compiler/empty-exportruntime.untouched.wat

@@ -1542,7 +1542,8 @@
     drop
     global.get $~lib/rt/itcms/total
     i64.extend_i32_u
-    i64.const 200
+    i32.const 200
+    i64.extend_i32_u
     i64.mul
     i64.const 100
     i64.div_u
@@ -2455,7 +2456,8 @@
   end
   global.get $~lib/rt/itcms/total
   i64.extend_i32_u
-  i64.const 200
+  i32.const 200
+  i64.extend_i32_u
   i64.mul
   i64.const 100
   i64.div_u