Fix for pr92880: I've removed the exception clause from the declaration of ajc$getIns...

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index 1b0d3eaea8d9eb8d418d00860830757dd88db1a4..1039559ccbb57db0d959279bb30af265ebbd39a7 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -749,9 +749,9 @@ public class AspectDeclaration extends TypeDeclaration {
                                        exc.placeEnd();
                                        codeStream.areturn();
                                        exc.place();
-                                       codeStream.astore_1();
-                                       codeStream.aload_1();
-                                       codeStream.athrow();                                    
+                                       // this just returns null now - the old version used to throw the caught exception!
+                                       codeStream.aconst_null();
+                                       codeStream.areturn();
                                }});
                }
        

diff --git a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
index 622ef79b194d84c51214a18e6e07a414e5c8ee6b..29b61e4f022c9e196ea7f2dc0d18b65dc38fa7a0 100644 (file)
--- a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
+++ b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
@@ -178,15 +178,14 @@ public class AjcMemberMaker {
        
        // PTWIMPL ResolvedMember for getInstance() method, declared in aspect
        public static ResolvedMember perTypeWithinGetInstance(UnresolvedType declaringType) {
-//             private static a.X ajc$getInstance(java.lang.Class) throws java/lang/Exception
+//             private static a.X ajc$getInstance(java.lang.Class)
                ResolvedMemberImpl rm = new ResolvedMemberImpl(
                        Member.METHOD, 
                        declaringType,
                        PRIVATE_STATIC,
                        declaringType, // return value
                        NameMangler.PERTYPEWITHIN_GETINSTANCE_METHOD,
-                       new UnresolvedType[]{UnresolvedType.JAVA_LANG_CLASS},
-                       new UnresolvedType[]{UnresolvedType.JAVA_LANG_EXCEPTION}
+                       new UnresolvedType[]{UnresolvedType.JAVA_LANG_CLASS}
                        );      
                return rm;
        }