From 86880f7281e04ed0c79781b5ddf2613821718b79 Mon Sep 17 00:00:00 2001 From: acolyer Date: Wed, 23 Nov 2005 19:21:03 +0000 Subject: [PATCH] tests and fix for pr114495 --- tests/bugs150/Pr114495.aj | 22 +++++++++++++++++++ .../systemtest/ajc150/Ajc150Tests.java | 4 ++++ .../org/aspectj/systemtest/ajc150/ajc150.xml | 13 +++++++++++ .../src/org/aspectj/weaver/ReferenceType.java | 15 ------------- .../src/org/aspectj/weaver/ResolvedType.java | 19 ++++++++++++++-- .../org/aspectj/weaver/bcel/BcelAdvice.java | 2 +- 6 files changed, 57 insertions(+), 18 deletions(-) create mode 100644 tests/bugs150/Pr114495.aj diff --git a/tests/bugs150/Pr114495.aj b/tests/bugs150/Pr114495.aj new file mode 100644 index 000000000..ebb7afcc5 --- /dev/null +++ b/tests/bugs150/Pr114495.aj @@ -0,0 +1,22 @@ +public class Pr114495 { + public static void main(String[] args) { + C.go(); + } + static class C { + static void go() {} + } +} + +abstract aspect AA_ParameterizedTypeInPointcut { + pointcut going() :call(void Target.go()) ; + before() : going() { + System.out.println("AA.going()"); + } +} +aspect A_ParameterizedTypeInPointcut +extends AA_ParameterizedTypeInPointcut { + declare warning : going() : "going()"; // works fine + before() : going() { // advice not applied + System.out.println("A.going()"); + } +} \ No newline at end of file diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java index 41960b5ae..c0ae27441 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java @@ -743,6 +743,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase { runTest("pertarget and negated pointcut"); } + public void testParameterizedPointcutAndAdvice() { + runTest("parameterized pointcut and advice"); + } + /* * Load-time weaving bugs */ diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index 19a8c0f2f..a12482ec2 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -27,6 +27,19 @@ + + + + + + + + + + + acj + + diff --git a/weaver/src/org/aspectj/weaver/ReferenceType.java b/weaver/src/org/aspectj/weaver/ReferenceType.java index fbf9ec0df..a3a22052b 100644 --- a/weaver/src/org/aspectj/weaver/ReferenceType.java +++ b/weaver/src/org/aspectj/weaver/ReferenceType.java @@ -475,21 +475,6 @@ public class ReferenceType extends ResolvedType { return declares; } - private boolean ajMembersNeedParameterization() { - if (isParameterizedType()) return true; - if (getSuperclass() != null) return ((ReferenceType)getSuperclass()).ajMembersNeedParameterization(); - return false; - } - - private Map getAjMemberParameterizationMap() { - Map myMap = getMemberParameterizationMap(); - if (myMap.size() == 0) { - // might extend a parameterized aspect that we also need to consider... - if (getSuperclass() != null) return ((ReferenceType)getSuperclass()).getAjMemberParameterizationMap(); - } - return myMap; - } - protected Collection getTypeMungers() { return delegate.getTypeMungers(); } protected Collection getPrivilegedAccesses() { return delegate.getPrivilegedAccesses(); } diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java index 1c3f5a637..ba8d60a48 100644 --- a/weaver/src/org/aspectj/weaver/ResolvedType.java +++ b/weaver/src/org/aspectj/weaver/ResolvedType.java @@ -678,11 +678,11 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl List l = new ArrayList(); ResolvedMember[] methods = getDeclaredMethods(); if (isParameterizedType()) methods = getGenericType().getDeclaredMethods(); - Map typeVariableMap = getMemberParameterizationMap(); + Map typeVariableMap = getAjMemberParameterizationMap(); for (int i=0, len = methods.length; i < len; i++) { ShadowMunger munger = methods[i].getAssociatedShadowMunger(); if (munger != null) { - if (this.isParameterizedType()) { + if (ajMembersNeedParameterization()) { //munger.setPointcut(munger.getPointcut().parameterizeWith(typeVariableMap)); munger = munger.parameterizeWith(this,typeVariableMap); if (munger instanceof Advice) { @@ -2003,5 +2003,20 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl } return parameterizedWithAMemberTypeVariable.alwaysTrue(); } + + protected boolean ajMembersNeedParameterization() { + if (isParameterizedType()) return true; + if (getSuperclass() != null) return ((ReferenceType)getSuperclass()).ajMembersNeedParameterization(); + return false; + } + + protected Map getAjMemberParameterizationMap() { + Map myMap = getMemberParameterizationMap(); + if (myMap.size() == 0) { + // might extend a parameterized aspect that we also need to consider... + if (getSuperclass() != null) return ((ReferenceType)getSuperclass()).getAjMemberParameterizationMap(); + } + return myMap; + } } diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java index a27e3270a..e74bb537d 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java @@ -93,7 +93,7 @@ public class BcelAdvice extends Advice { BcelAdvice ret = null; Member adviceSignature = signature; // allows for around advice where the return value is a type variable (see pr115250) - if (signature instanceof ResolvedMember) { + if (signature instanceof ResolvedMember && signature.getDeclaringType().isGenericType()) { adviceSignature = ((ResolvedMember)signature).parameterizedWith(declaringType.getTypeParameters(),declaringType,declaringType.isParameterizedType()); } ret = new BcelAdvice(this.attribute,pc,adviceSignature,this.concreteAspect); -- 2.39.5