Merge branch 'VerifyErrorFix' into CustomizedSoot

tim-hoffman · tim-hoffman · commit a0aa5e17947b · 2015-08-31T17:13:35.000-05:00
diff --git a/src/soot/toolkits/graph/ExceptionalUnitGraph.java b/src/soot/toolkits/graph/ExceptionalUnitGraph.java
@@ -352,7 +352,7 @@ protected Map<Unit, Collection<ExceptionDest>> buildExceptionDests(
 				}
 				ThrowableSet.Pair catchableAs = thrownSet
 						.whichCatchableAs(catcher);
-				if (!catchableAs.getCaught().equals(
+				if (unit.equals(trap.getBeginUnit()) || !catchableAs.getCaught().equals(
 						ThrowableSet.Manager.v().EMPTY)) {
 					result = addDestToMap(result, unit, trap,
 							catchableAs.getCaught());
@@ -936,4 +936,4 @@ public String toString() {
 
 		return buf.toString();
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ protected Map<Unit, Collection<ExceptionDest>> buildExceptionDests(`
`352`	`352`	`}`
`353`	`353`	`ThrowableSet.Pair catchableAs = thrownSet`
`354`	`354`	`.whichCatchableAs(catcher);`
`355`		`- if (!catchableAs.getCaught().equals(`
	`355`	`+ if (unit.equals(trap.getBeginUnit()) \|\| !catchableAs.getCaught().equals(`
`356`	`356`	`ThrowableSet.Manager.v().EMPTY)) {`
`357`	`357`	`result = addDestToMap(result, unit, trap,`
`358`	`358`	`catchableAs.getCaught());`
`@@ -936,4 +936,4 @@ public String toString() {`
`936`	`936`
`937`	`937`	`return buf.toString();`
`938`	`938`	`}`
`939`		`-}`
	`939`	`+}`