Merge pull request CosmosOS#259 from rebizu/master

fixing CosmosOS#254
nagyistge · Nov 18, 2015 · c85d421 · c85d421
2 parents 0eee55c + 3d82193
commit c85d421
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/source/Cosmos.IL2CPU/ILOpCodes/OpNone.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpNone.cs
@@ -522,6 +522,15 @@ protected override void DoInterpretStackTypes(ref bool aSituationChanged)
           if (!StackPopTypes.Contains(null))
           {
             // PopTypes set, but PushType not yet, so fill it.
+
+            if ((StackPopTypes[0] == typeof(bool) && StackPopTypes[1] == typeof(Int32)) ||
+              (StackPopTypes[0] == typeof(Int32) && StackPopTypes[1] == typeof(bool)))
+            {
+              StackPushTypes[0] = typeof(Int32);
+              aSituationChanged = true;
+              return;
+            }
+
             if ((StackPopTypes[0] == typeof (IntPtr) && StackPopTypes[1] == typeof (UInt32*))
               || (StackPopTypes[0] == typeof (uint*) && StackPopTypes[1] == typeof (IntPtr)))
             {