Fix 490315 - InvokeDynamic.java:126 there is no classname for invokedynamic

2 files changed, 7 insertions, 2 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
index 9218ada88..185ab046c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
@@ -4,7 +4,7 @@
      The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
      org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. 
 ### AspectJ-specific messages 
-compiler.name = AspectJ Compiler 1.8.9
+compiler.name = AspectJ Compiler 1.8.10
 compiler.version = Eclipse Compiler Mars.2 #A7BBA8B1, 3.12
 compiler.copyright = 
 
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index dd38f7750..7da62b87c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -485,7 +485,12 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 			}
 		}
 
-		((IProgramElement) stack.peek()).addChild(peNode);
+		IProgramElement ipe = (IProgramElement)stack.peek();
+		if (ipe!=null) {
+			// With AspectJ 1.8.9 the type structure must be slightly different as the guard
+			// is required (the null is due to a default constructor).
+			((IProgramElement) stack.peek()).addChild(peNode);
+		}
 		stack.push(peNode);
 		return true;
 	}