ISGOSU-295. Backport 0a3d4ec from 1.14

gosu-lang · Mar 18, 2020 · 69021e2 · 69021e2
1 parent 4643848
commit 69021e2
Showing 1 changed file with 7 additions and 22 deletions.
diff --git a/...main/java/gw/internal/gosu/ir/compiler/bytecode/statement/IRDoWhileStatementCompiler.java b/...main/java/gw/internal/gosu/ir/compiler/bytecode/statement/IRDoWhileStatementCompiler.java
@@ -25,30 +25,15 @@ public static void compile( IRDoWhileStatement doWhileStatement, IRBytecodeConte
     context.pushScope();
     try
     {
-      if( doWhileStatement.getLeastSignificantTerminalStatement() != null )
-      {
-        context.visitLabel( conditionLabel );
-        IRBytecodeCompiler.compileIRStatement( doWhileStatement.getBody(), context );
-        context.visitLabel( breakLabel );
-      }
-      else
-      {
-        context.visitLabel( loopBodyStart ); // body start
-        IRBytecodeCompiler.compileIRStatement( doWhileStatement.getBody(), context );
+      context.visitLabel( loopBodyStart ); // body start
+      IRBytecodeCompiler.compileIRStatement( doWhileStatement.getBody(), context );
 
-        context.visitLabel( conditionLabel );
-        context.setLineNumber( doWhileStatement.getLoopTest().getLineNumber() );
-        IRBytecodeCompiler.compileIRExpression( doWhileStatement.getLoopTest(), context );
-        context.getMv().visitJumpInsn( Opcodes.IFNE, loopBodyStart );
+      context.visitLabel( conditionLabel );
+      context.setLineNumber( doWhileStatement.getLoopTest().getLineNumber() );
+      IRBytecodeCompiler.compileIRExpression( doWhileStatement.getLoopTest(), context );
+      context.getMv().visitJumpInsn( Opcodes.IFNE, loopBodyStart );
 
-        context.getMv().visitLabel( breakLabel );
-
-        IRReturnStatement implicitReturn = doWhileStatement.getImplicitReturnStatement();
-        if( implicitReturn != null )
-        {
-          IRBytecodeCompiler.compileIRStatement( implicitReturn, context );
-        }
-      }
+      context.getMv().visitLabel( breakLabel );
     }
     finally
     {