Fix #1863

Including this as part of the Underanalyzer branch, as it includes many other compiler changes/fixes
UnderminersTeam · Aug 12, 2024 · 390de70 · 390de70
1 parent 939e4d8
commit 390de70
Showing 1 changed file with 30 additions and 3 deletions.
diff --git a/UndertaleModLib/Compiler/AssemblyWriter.cs b/UndertaleModLib/Compiler/AssemblyWriter.cs
@@ -2169,7 +2169,15 @@ private static void AssembleVariablePush(CodeWriter cw, Parser.Statement e, out
                                 cw.typeStack.Push(DataType.Variable);
                                 if (notLast)
                                 {
-                                    cw.Emit(Opcode.Conv, cw.typeStack.Pop(), DataType.Int32);
+                                    if (CompileContext.GMS2_3)
+                                    {
+                                        cw.typeStack.Pop();
+                                        cw.Emit(Opcode.PushI, DataType.Int16).Value = (short)-9; // stacktop conversion
+                                    }
+                                    else
+                                    {
+                                        cw.Emit(Opcode.Conv, cw.typeStack.Pop(), DataType.Int32);
+                                    }
                                 }
                                 else
                                     isArray = true;
@@ -2190,7 +2198,15 @@ private static void AssembleVariablePush(CodeWriter cw, Parser.Statement e, out
                                 cw.typeStack.Push(DataType.Variable);
                                 if (next + 1 < e.Children.Count)
                                 {
-                                    cw.Emit(Opcode.Conv, cw.typeStack.Pop(), DataType.Int32);
+                                    if (CompileContext.GMS2_3)
+                                    {
+                                        cw.typeStack.Pop();
+                                        cw.Emit(Opcode.PushI, DataType.Int16).Value = (short)-9; // stacktop conversion
+                                    }
+                                    else
+                                    {
+                                        cw.Emit(Opcode.Conv, cw.typeStack.Pop(), DataType.Int32);
+                                    }
                                 }
                             }
                         }
@@ -2464,7 +2480,18 @@ private static void AssembleStoreVariable(CodeWriter cw, Parser.Statement s, Dat
                                 VarType = s.Children[next].Children.Count != 0 ? VariableType.Array : VariableType.StackTop
                             });
                             if (next + 1 < s.Children.Count)
-                                cw.Emit(Opcode.Conv, DataType.Variable, DataType.Int32);
+                            {
+                                if (CompileContext.GMS2_3)
+                                {
+                                    cw.typeStack.Pop();
+                                    cw.Emit(Opcode.PushI, DataType.Int16).Value = (short)-9; // stacktop conversion
+                                    cw.typeStack.Push(DataType.Int32);
+                                }
+                                else
+                                {
+                                    cw.Emit(Opcode.Conv, DataType.Variable, DataType.Int32);
+                                }
+                            }
                         }
                         if (!skip)
                             cw.typeStack.Pop();