harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r512299 - /harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
Date Tue, 27 Feb 2007 16:07:36 GMT
Author: gshimansky
Date: Tue Feb 27 08:07:35 2007
New Revision: 512299

URL: http://svn.apache.org/viewvc?view=rev&rev=512299
Log:
Applied HARMONY-3171 [drlvm][interpreter] finally block is unreachable when try statement
uses while(true) loop

Tests passed on Ubuntu6 x86, Windows 2003 server x86 and SuSE9 x86_64


Modified:
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp?view=diff&rev=512299&r1=512298&r2=512299
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp Tue Feb 27 08:07:35 2007
@@ -2866,8 +2866,8 @@
 
             case OPCODE_TABLESWITCH: Opcode_TABLESWITCH(frame); break;
             case OPCODE_LOOKUPSWITCH: Opcode_LOOKUPSWITCH(frame); break;
-            case OPCODE_GOTO: Opcode_GOTO(frame); break;
-            case OPCODE_GOTO_W: Opcode_GOTO_W(frame); break;
+            case OPCODE_GOTO: Opcode_GOTO(frame); goto check_exception;
+            case OPCODE_GOTO_W: Opcode_GOTO_W(frame); goto check_exception;
             case OPCODE_JSR: Opcode_JSR(frame); break;
             case OPCODE_JSR_W: Opcode_JSR_W(frame); break;
             case OPCODE_RET: Opcode_RET(frame); break;
@@ -2917,7 +2917,7 @@
             case OPCODE_LDC2_W: Opcode_LDC2_W(frame); break;
 
             case OPCODE_IFNULL:
-            case OPCODE_IFEQ: Opcode_IFEQ(frame); break;
+            case OPCODE_IFEQ: Opcode_IFEQ(frame); goto check_exception;
 
             case OPCODE_IFNONNULL:
             case OPCODE_IFNE: Opcode_IFNE(frame); goto check_exception;



Mime
View raw message