svn commit: r382272 - in /jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals: ControlFlowGraph.java InstructionContext.java

Author: tcurdt
Date: Wed Mar  1 19:31:46 2006
New Revision: 382272

URL: http://svn.apache.org/viewcvs?rev=382272&view=rev
Log:
applied

http://issues.apache.org/bugzilla/show_bug.cgi?id=27854


Modified:
    jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
    jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java

Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java?rev=382272&r1=382271&r2=382272&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java Wed Mar  1 19:31:46 2006
@@ -124,6 +124,19 @@
 			return org.getClone();
 		}
 
+    public Frame getInFrame() {
+		  Frame org;
+			
+			InstructionContext jsr = lastExecutionJSR();
+			
+			org = (Frame) inFrames.get(jsr);
+
+			if (org == null){
+			    throw new AssertionViolatedException("inFrame not set! This:\n"+this+"\nInFrames: '"+inFrames+"'.");
+      }
+      return org.getClone();
+    }
+
 		/**
 		 * "Merges in" (vmspec2, page 146) the "incoming" frame situation;
 		 * executes the instructions symbolically

Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java?rev=382272&r1=382271&r2=382272&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java Wed Mar  1 19:31:46 2006
@@ -73,6 +73,8 @@
 	 */
 	boolean execute(Frame inFrame, ArrayList executionPredecessors, InstConstraintVisitor icv, ExecutionVisitor ev);
 
+	Frame getInFrame();
+
 	/**
 	 * This method returns the outgoing execution frame situation;
 	 * therefore <B>it has to be calculated by execute(Frame, ArrayList)