jakarta-bcel-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From en...@apache.org
Subject cvs commit: jakarta-bcel/src/java/org/apache/bcel/verifier/structurals ControlFlowGraph.java
Date Mon, 25 Aug 2003 16:50:37 GMT
enver       2003/08/25 09:50:37

  Modified:    src/java/org/apache/bcel/verifier/statics
                        Pass3aVerifier.java
               src/java/org/apache/bcel/verifier/structurals
                        ControlFlowGraph.java
  Log:
  PR:Fixed typos. Fixed buggy ControlFlowGraph.isDead(InstructionHandle).
  
  Revision  Changes    Path
  1.6       +4 -4      jakarta-bcel/src/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
  
  Index: Pass3aVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Pass3aVerifier.java	20 Aug 2003 12:36:17 -0000	1.5
  +++ Pass3aVerifier.java	25 Aug 2003 16:50:37 -0000	1.6
  @@ -989,7 +989,7 @@
   				}
   			}
   			if (m == null){
  -				constraintViolated(o, "Referenced method '"+o.getMethodName(cpg)+"' with expected signature
not found in class '"+jc.getClassName()+"'. The native verfier does allow the method to be
declared in some superinterface, which the Java Virtual Machine Specification, Second Edition
does not.");
  +				constraintViolated(o, "Referenced method '"+o.getMethodName(cpg)+"' with expected signature
not found in class '"+jc.getClassName()+"'. The native verifier does allow the method to be
declared in some superinterface, which the Java Virtual Machine Specification, Second Edition
does not.");
   			}
   			if (jc.isClass()){
   				constraintViolated(o, "Referenced class '"+jc.getClassName()+"' is a class, but not
an interface as expected.");
  @@ -1020,7 +1020,7 @@
   				}
   			}
   			if (m == null){
  -				constraintViolated(o, "Referenced method '"+o.getMethodName(cpg)+"' with expected signature
not found in class '"+jc.getClassName()+"'. The native verfier does allow the method to be
declared in some superclass or implemented interface, which the Java Virtual Machine Specification,
Second Edition does not.");
  +				constraintViolated(o, "Referenced method '"+o.getMethodName(cpg)+"' with expected signature
not found in class '"+jc.getClassName()+"'. The native verifier does allow the method to be
declared in some superclass or implemented interface, which the Java Virtual Machine Specification,
Second Edition does not.");
   			}
   			
   			JavaClass current = Repository.lookupClass(myOwner.getClassName());
  @@ -1117,7 +1117,7 @@
   				}
   			}
   			if (m == null){
  -				constraintViolated(o, "Referenced method '"+o.getMethodName(cpg)+"' with expected signature
not found in class '"+jc.getClassName()+"'. The native verfier does allow the method to be
declared in some superclass or implemented interface, which the Java Virtual Machine Specification,
Second Edition does not.");
  +				constraintViolated(o, "Referenced method '"+o.getMethodName(cpg)+"' with expected signature
not found in class '"+jc.getClassName()+"'. The native verifier does allow the method to be
declared in some superclass or implemented interface, which the Java Virtual Machine Specification,
Second Edition does not.");
   			}
   			if (! (jc.isClass())){
   				constraintViolated(o, "Referenced class '"+jc.getClassName()+"' is an interface, but
not a class as expected.");
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ControlFlowGraph.java	20 Aug 2003 11:44:13 -0000	1.3
  +++ ControlFlowGraph.java	25 Aug 2003 16:50:37 -0000	1.4
  @@ -473,6 +473,6 @@
   	 * if it is not part of this ControlFlowGraph.
   	 */
   	public boolean isDead(InstructionHandle i){
  -		return instructionContexts.containsKey(i);
  +        return subroutines.subroutineOf(i) == null;
   	}	 
   }
  
  
  

Mime
View raw message