fix for Bugzilla Bug 41175

	  	binary aspect-declared methods conflict, lost their exception clauses

larger fix to address more issues with aspect-declared methods in bytecode form
also addressed declared exception issue more generally

this fix should be more stable than a smaller hack that just fixed this specific bug
report would have been.  added a few tests to match increased scope.

3 files changed, 28 insertions, 0 deletions

diff --git a/tests/bugs/DeclaredExceptions.java b/tests/bugs/DeclaredExceptions.java
new file mode 100644
index 000000000..9baec0c15
--- /dev/null
+++ b/tests/bugs/DeclaredExceptions.java
@@ -0,0 +1,28 @@
+import java.lang.reflect.Method;
+import java.io.*;
+import org.aspectj.testing.Tester;
+
+public class DeclaredExceptions {
+	public static void main(String[] args) throws Exception {
+		Class c = C.class;
+		Method m = c.getDeclaredMethod("m", new Class[0]);
+		Tester.checkEqual(m.getExceptionTypes().length, 1);
+		Tester.checkEqual(m.getExceptionTypes()[0], IOException.class);
+		
+		c = I.class;
+		m = c.getDeclaredMethod("m", new Class[0]);
+		Tester.checkEqual(m.getExceptionTypes().length, 1);
+		Tester.checkEqual(m.getExceptionTypes()[0], IOException.class);
+	}
+}
+
+interface I {}
+
+class C {}
+
+aspect A {
+	public void C.m() throws IOException {
+	}
+	
+	public void I.m() throws IOException { }
+}
\ No newline at end of file
diff --git a/tests/bugs/interfaceLibrary/lib.jar b/tests/bugs/interfaceLibrary/lib.jar
index 496514a29..57acb6aad 100644
--- a/tests/bugs/interfaceLibrary/lib.jar
+++ b/tests/bugs/interfaceLibrary/lib.jar
diff --git a/tests/bugs/interfaceLibrary/libClass.jar b/tests/bugs/interfaceLibrary/libClass.jar
index 720435d62..ee68ce1c0 100644
--- a/tests/bugs/interfaceLibrary/libClass.jar
+++ b/tests/bugs/interfaceLibrary/libClass.jar