1.8.10 dev build
diff --git a/org.aspectj.ajde/classes/org/aspectj/ajdt/ajc/BuildArgParser.class b/org.aspectj.ajde/classes/org/aspectj/ajdt/ajc/BuildArgParser.class
index a0a6f41..1660db0 100644
--- a/org.aspectj.ajde/classes/org/aspectj/ajdt/ajc/BuildArgParser.class
+++ b/org.aspectj.ajde/classes/org/aspectj/ajdt/ajc/BuildArgParser.class
Binary files differ
diff --git a/org.aspectj.ajde/classes/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajde/classes/org/aspectj/ajdt/ajc/messages.properties
index 9218ada..185ab04 100644
--- a/org.aspectj.ajde/classes/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajde/classes/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.ajde/classes/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.class b/org.aspectj.ajde/classes/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.class
index 392dc5f..8d479f2 100644
--- a/org.aspectj.ajde/classes/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.class
+++ b/org.aspectj.ajde/classes/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.class
Binary files differ
diff --git a/org.aspectj.ajde/source/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajde/source/org/aspectj/ajdt/ajc/messages.properties
index 9218ada..185ab04 100644
--- a/org.aspectj.ajde/source/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajde/source/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.ajde/source/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajde/source/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index dd38f77..7da62b8 100644
--- a/org.aspectj.ajde/source/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajde/source/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -485,7 +485,12 @@
}
}
- ((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;
}
diff --git a/org.aspectj.weaver/classes/org/aspectj/bridge/Version.class b/org.aspectj.weaver/classes/org/aspectj/bridge/Version.class
index 8fbf69a..22429ad 100644
--- a/org.aspectj.weaver/classes/org/aspectj/bridge/Version.class
+++ b/org.aspectj.weaver/classes/org/aspectj/bridge/Version.class
Binary files differ
diff --git a/org.aspectj.weaver/classes/org/aspectj/weaver/Dump.class b/org.aspectj.weaver/classes/org/aspectj/weaver/Dump.class
index a929915..8f0771a 100644
--- a/org.aspectj.weaver/classes/org/aspectj/weaver/Dump.class
+++ b/org.aspectj.weaver/classes/org/aspectj/weaver/Dump.class
Binary files differ
diff --git a/org.aspectj.weaver/classes/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.class b/org.aspectj.weaver/classes/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.class
index 613bde5..4001d2a 100644
--- a/org.aspectj.weaver/classes/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.class
+++ b/org.aspectj.weaver/classes/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.class
Binary files differ
diff --git a/org.aspectj.weaver/classes/org/aspectj/weaver/tools/WeavingAdaptor.class b/org.aspectj.weaver/classes/org/aspectj/weaver/tools/WeavingAdaptor.class
index 3044ba0..cb3c176 100644
--- a/org.aspectj.weaver/classes/org/aspectj/weaver/tools/WeavingAdaptor.class
+++ b/org.aspectj.weaver/classes/org/aspectj/weaver/tools/WeavingAdaptor.class
Binary files differ
diff --git a/org.aspectj.weaver/source/org/aspectj/bridge/Version.java b/org.aspectj.weaver/source/org/aspectj/bridge/Version.java
index e2c3488..ded8786 100644
--- a/org.aspectj.weaver/source/org/aspectj/bridge/Version.java
+++ b/org.aspectj.weaver/source/org/aspectj/bridge/Version.java
@@ -37,7 +37,7 @@
* Time text set by build script using SIMPLE_DATE_FORMAT.
* (if DEVELOPMENT version, invalid)
*/
- public static final String time_text = "Tuesday Mar 15, 2016 at 14:57:38 GMT";
+ public static final String time_text = "Tuesday Mar 29, 2016 at 17:04:52 GMT";
/**
* time in seconds-since-... format, used by programmatic clients.
diff --git a/org.aspectj.weaver/source/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.java b/org.aspectj.weaver/source/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.java
index 9f84596..b81f7ff 100644
--- a/org.aspectj.weaver/source/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.java
+++ b/org.aspectj.weaver/source/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.java
@@ -27,6 +27,7 @@
import org.aspectj.apache.bcel.generic.InstructionFactory;
import org.aspectj.apache.bcel.generic.InstructionHandle;
import org.aspectj.apache.bcel.generic.InstructionList;
+import org.aspectj.apache.bcel.generic.InvokeDynamic;
import org.aspectj.apache.bcel.generic.InvokeInstruction;
import org.aspectj.apache.bcel.generic.Type;
import org.aspectj.weaver.AjAttribute;
@@ -138,6 +139,10 @@
// open-up method call
if ((inst instanceof InvokeInstruction)) {
InvokeInstruction invoke = (InvokeInstruction) inst;
+ if (invoke instanceof InvokeDynamic) {
+ realizedCannotInline = true;
+ break;
+ }
ResolvedType callee = aspectGen.getWorld().resolve(UnresolvedType.forName(invoke.getClassName(cpg)));
// look in the whole method list and not just declared for super calls and alike
diff --git a/org.eclipse.ajdt.releng/build.properties b/org.eclipse.ajdt.releng/build.properties
index 88a889b..e604f11 100644
--- a/org.eclipse.ajdt.releng/build.properties
+++ b/org.eclipse.ajdt.releng/build.properties
@@ -29,7 +29,8 @@
# 1.8.9.20160119082720 - 1.8.9 snapshot
# 1.8.9.20160308095600 - 1.8.9 snapshot
# 1.8.9.20160315000000 - 1.8.9 release
-ajde.version=1.8.9.20160315000000
+# 1.8.10.20160329000000 - 1.8.10 dev
+ajde.version=1.8.10.20160329000000
builder=.
