cvs commit: jakarta-bcel/src/java/org/apache/bcel/verifier/structurals ControlFlowGraph.java

enver       2004/10/23 06:08:24

  Modified:    src/java/org/apache/bcel/verifier/structurals
                        ControlFlowGraph.java
  Log:
  Remove Assertion from ControlFlowGraph to widen the possible use
  cases of the Control Flow Graph class. The assertion was only here
  to make sure JustIce wouldn't run into endless recursions.
  
  Revision  Changes    Path
  1.6       +6 -5      jakarta-bcel/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
  
  Index: ControlFlowGraph.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ControlFlowGraph.java	20 Oct 2004 14:42:24 -0000	1.5
  +++ ControlFlowGraph.java	23 Oct 2004 13:08:24 -0000	1.6
  @@ -350,16 +350,17 @@
   				if (s==null){ //return empty; // RET in dead code. "empty" would be the correct answer, but we know something about the surrounding project...
   					throw new AssertionViolatedException("Asking for successors of a RET in dead code?!");
   				}
  -//TODO: remove
  -throw new AssertionViolatedException("DID YOU REALLY WANT TO ASK FOR RET'S SUCCS?");
  -/*
  +
  +//TODO: remove. Only JustIce must not use it, but foreign users of the ControlFlowGraph
  +//      will want it. Thanks Johannes Wust.
  +//throw new AssertionViolatedException("DID YOU REALLY WANT TO ASK FOR RET'S SUCCS?");
  +
   				InstructionHandle[] jsrs = s.getEnteringJsrInstructions();
   				InstructionHandle[] ret = new InstructionHandle[jsrs.length];
   				for (int i=0; i<jsrs.length; i++){
   					ret[i] = jsrs[i].getNext();
   				}
   				return ret;
  -*/
   			}
   		
   			// Terminates method normally.