DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unnecessary InvalidClassFileException declarations 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@3618 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2009-05-29 14:23:29 +00:00
parent 1a181c55d5
commit 6f96d41dc2
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java
View File

@ -48,7 +48,6 @@ import com.ibm.wala.ipa.callgraph.CGNode;
import com.ibm.wala.ipa.callgraph.CallGraph;
import com.ibm.wala.ipa.cha.IClassHierarchy;
import com.ibm.wala.properties.WalaProperties;
import com.ibm.wala.shrikeCT.InvalidClassFileException;
import com.ibm.wala.ssa.IR;
import com.ibm.wala.ssa.SSAInstruction;
import com.ibm.wala.types.ClassLoaderReference;
@ -231,13 +230,7 @@ public abstract class IRTests extends WalaTestCase {
SSAInstruction[] insts = ir.getInstructions();
for (int i = 0; i < insts.length; i++) {
if (insts[i] != null) {
int ln = -1;
try {
ln = m.getLineNumber(i);
} catch (InvalidClassFileException e) {
e.printStackTrace();
Assertions.UNREACHABLE();
}
int ln = m.getLineNumber(i);
if (ln == definingLineNumber) {
System.err.println((" found " + insts[i] + " at " + ln));
for (int j = 0; j < insts[i].getNumberOfDefs(); j++) {

6
com.ibm.wala.core/src/com/ibm/wala/classLoader/IMethod.java
View File

@ -115,16 +115,14 @@ public interface IMethod extends IMember, ContextItem {
/**
* @return the source line number corresponding to a particular bytecode index, or -1 if the information is not available.
* @throws InvalidClassFileException
*/
int getLineNumber(int bcIndex) throws InvalidClassFileException;
int getLineNumber(int bcIndex);
/**
* @return the (source code) name of the local variable of a given number at the specified program counter, or null if the
* information is not available.
* @throws InvalidClassFileException
*/
String getLocalVariableName(int bcIndex, int localNumber) throws InvalidClassFileException;
String getLocalVariableName(int bcIndex, int localNumber);
/**
* something like: com.foo.bar.createLargeOrder(IILjava.lang.String;SLjava.sql.Date;)Ljava.lang.Integer;

11
com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java
View File

@ -743,8 +743,12 @@ public abstract class ShrikeBTMethod implements IMethod, BytecodeConstants {
/*
* @see com.ibm.wala.classLoader.IMethod#getLineNumber(int)
*/
public int getLineNumber(int bcIndex) throws InvalidClassFileException {
return (getBCInfo().lineNumberMap == null) ? -1 : getBCInfo().lineNumberMap[bcIndex];
public int getLineNumber(int bcIndex) {
try {
return (getBCInfo().lineNumberMap == null) ? -1 : getBCInfo().lineNumberMap[bcIndex];
} catch (InvalidClassFileException e) {
return -1;
}
}
/**
@ -788,8 +792,7 @@ public abstract class ShrikeBTMethod implements IMethod, BytecodeConstants {
/*
* @see com.ibm.wala.classLoader.IMethod#getLocalVariableName(int, int)
*/
public abstract String getLocalVariableName(int bcIndex, int localNumber) throws InvalidClassFileException;
public abstract String getLocalVariableName(int bcIndex, int localNumber);
/*
* TODO: cache for efficiency?

9
com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java
View File

@ -156,8 +156,13 @@ public final class ShrikeCTMethod extends ShrikeBTMethod implements IBytecodeMet
}
@Override
public String getLocalVariableName(int bcIndex, int localNumber) throws InvalidClassFileException {
int[][] map = getBCInfo().localVariableMap;
public String getLocalVariableName(int bcIndex, int localNumber){
int[][] map = null;
try {
map = getBCInfo().localVariableMap;
} catch (InvalidClassFileException e1) {
return null;
}
if (localNumber > getMaxLocals()) {
throw new IllegalArgumentException("illegal local number: " + localNumber + ", method " + getName() + " uses at most "