375777: ClassCastException

1 files changed, 11 insertions, 6 deletions

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
index 91571713b..e56fecd7f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@ -567,14 +567,19 @@ public abstract class World implements Dump.INode {
 	 */
 	private ReferenceType resolveGenericWildcardFor(WildcardedUnresolvedType aType) {
 		BoundedReferenceType ret = null;
-		// FIXME asc doesnt take account of additional interface bounds (e.g. ?
-		// super R & Serializable - can you do that?)
+		// FIXME asc doesnt take account of additional interface bounds (e.g. ? super R & Serializable - can you do that?)
 		if (aType.isExtends()) {
-			ReferenceType upperBound = (ReferenceType) resolve(aType.getUpperBound());
-			ret = new BoundedReferenceType(upperBound, true, this);
+			ResolvedType resolvedUpperBound = resolve(aType.getUpperBound());
+			if (resolvedUpperBound.isMissing()) {
+				return getWildcard();
+			}
+			ret = new BoundedReferenceType((ReferenceType)resolvedUpperBound, true, this);
 		} else if (aType.isSuper()) {
-			ReferenceType lowerBound = (ReferenceType) resolve(aType.getLowerBound());
-			ret = new BoundedReferenceType(lowerBound, false, this);
+			ResolvedType resolvedLowerBound = resolve(aType.getLowerBound());
+			if (resolvedLowerBound.isMissing()) {
+				return getWildcard();
+			}
+			ret = new BoundedReferenceType((ReferenceType)resolvedLowerBound, false, this);
 		} else {
 			// must be ? on its own!
 			ret = getWildcard();