307009: test and fix: declare soft and call joinpoint (matching on annotations)

4 files changed, 26 insertions, 0 deletions

diff --git a/tests/bugs169/pr307009/Ann.java b/tests/bugs169/pr307009/Ann.java
new file mode 100644
index 000000000..c6d768960
--- /dev/null
+++ b/tests/bugs169/pr307009/Ann.java
@@ -0,0 +1,7 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.CLASS)
+public @interface Ann
+{
+}
+
diff --git a/tests/bugs169/pr307009/Bug.aj b/tests/bugs169/pr307009/Bug.aj
new file mode 100644
index 000000000..d7d94d083
--- /dev/null
+++ b/tests/bugs169/pr307009/Bug.aj
@@ -0,0 +1,6 @@
+public aspect Bug {
+	// works when specifying *.aj *.java, fails when using -sourceroots!
+	declare soft : Exception : call(@Ann * *(..));
+	// this works in both cases!
+	//declare soft : Exception : call(* m2(..));
+}
diff --git a/tests/bugs169/pr307009/Test.java b/tests/bugs169/pr307009/Test.java
new file mode 100644
index 000000000..c93ce5801
--- /dev/null
+++ b/tests/bugs169/pr307009/Test.java
@@ -0,0 +1,6 @@
+public class Test
+{
+	public void m() {
+		new Test2().m2();
+	}
+}
diff --git a/tests/bugs169/pr307009/Test2.java b/tests/bugs169/pr307009/Test2.java
new file mode 100644
index 000000000..335232709
--- /dev/null
+++ b/tests/bugs169/pr307009/Test2.java
@@ -0,0 +1,7 @@
+public class Test2
+{
+	@Ann
+	public void m2() throws Exception {
+		throw new Exception();
+	}
+}