--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Fri May 09 08:52:57 2014 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Fri May 09 09:28:47 2014 -0400
@@ -317,10 +317,6 @@
int makeRef(DiagnosticPosition pos, Type type) {
checkDimension(pos, type);
if (type.isAnnotated()) {
- // Treat annotated types separately - we don't want
- // to collapse all of them - at least for annotated
- // exceptions.
- // TODO: review this.
return pool.put((Object)type);
} else {
return pool.put(type.hasTag(CLASS) ? (Object)type.tsym : (Object)type);
@@ -1647,7 +1643,7 @@
if (subCatch.type.isAnnotated()) {
for (Attribute.TypeCompound tc :
subCatch.type.getAnnotationMirrors()) {
- tc.position.setCatchType(catchType);
+ tc.position.setCatchInfo(catchType, startpc);
}
}
}
@@ -1664,7 +1660,7 @@
if (subCatch.type.isAnnotated()) {
for (Attribute.TypeCompound tc :
subCatch.type.getAnnotationMirrors()) {
- tc.position.setCatchType(catchType);
+ tc.position.setCatchInfo(catchType, startpc);
}
}
}