diff options
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java | 4 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java | 6 | ||||
| -rw-r--r-- | org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip | bin | 3704782 -> 3704998 bytes | |||
| -rw-r--r-- | org.eclipse.jdt.core/jdtcore-for-aspectj.jar | bin | 5207646 -> 5207036 bytes | |||
| -rw-r--r-- | tests/bugs150/Pr109283.aj | 27 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java | 4 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/ajc150.xml | 13 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/AjcMemberMaker.java | 44 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java | 4 |
9 files changed, 80 insertions, 22 deletions
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 fa0735819..78387f762 100644 --- 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 @@ -1015,8 +1015,8 @@ public class AspectDeclaration extends TypeDeclaration { hasAspectMethod = AjcMemberMaker.perObjectHasAspectMethod(typeX); } else if (perClause.getKind() == PerClause.PERTYPEWITHIN) { // PTWIMPL Use these variants of aspectOf()/hasAspect() - aspectOfMethod = AjcMemberMaker.perTypeWithinAspectOfMethod(typeX); - hasAspectMethod = AjcMemberMaker.perTypeWithinHasAspectMethod(typeX); + aspectOfMethod = AjcMemberMaker.perTypeWithinAspectOfMethod(typeX,world.getWorld().isInJava5Mode()); + hasAspectMethod = AjcMemberMaker.perTypeWithinHasAspectMethod(typeX,world.getWorld().isInJava5Mode()); } else { throw new RuntimeException("bad per clause: " + perClause); } diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java index e95c78233..68858e92e 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java @@ -570,12 +570,6 @@ public class EclipseFactory { private ReferenceBinding lookupBinding(String sname) { char[][] name = CharOperation.splitOn('.', sname.toCharArray()); ReferenceBinding rb = lookupEnvironment.getType(name); - // XXX We do this because the pertypewithin aspectOf(Class) generated method needs it. Without this - // we don't get a 'rawtype' as the argument type for a messagesend to aspectOf() and this leads to - // a compile error if some client class calls aspectOf(A.class) or similar as it says Class<A> isn't - // compatible with Class<T> - if (sname.equals("java.lang.Class")) - rb = lookupEnvironment.createRawType(rb,rb.enclosingType()); return rb; } diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip Binary files differindex 4a5736a8f..e3479fc95 100644 --- a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip +++ b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar Binary files differindex bf98438ee..0b21e3484 100644 --- a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar +++ b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar diff --git a/tests/bugs150/Pr109283.aj b/tests/bugs150/Pr109283.aj new file mode 100644 index 000000000..62d378e05 --- /dev/null +++ b/tests/bugs150/Pr109283.aj @@ -0,0 +1,27 @@ +import java.util.*; + +public class Pr109283 { + + enum Foo { Wibble, Wobble, Woo } + + public static void main(String[] args) throws Exception { + EnumSet<Foo> set = EnumSet.noneOf(Foo.class); + C c2 = Recipient.instanceOf(C.class); + } + + +} + +class C {} + +class Recipient {} + +aspect Donor { + + static <E> E Recipient.first(List<E> elements) { return elements.get(0); } + + public static <T> T Recipient.instanceOf(Class<T> aT) throws Exception { + return aT.newInstance(); + } + +} diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java index c1d78b21b..6c3cb6dac 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java @@ -450,6 +450,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase { runTest("declare parents on a missing type"); } + public void testParameterizedGenericMethods() { + runTest("parameterized generic methods"); + } + // helper methods..... public SyntheticRepository createRepos(File cpentry) { diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index de0c97a6b..fb1ce4b0b 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -602,6 +602,11 @@ </compile> </ajc-test> + <ajc-test dir="bugs150" title="parameterized generic methods"> + <compile files="Pr109283.aj" options="-1.5 -warn:indirectStatic"> + </compile> + </ajc-test> + <!-- ============================================================================ --> <!-- ============================================================================ --> @@ -3287,7 +3292,7 @@ <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - I2"> <compile files="MethodI2.aj" options="-1.5"> - <message kind="error" line="7" text="The method m(List<Integer>) in the type Base<N> is not applicable for the arguments (List<String>)"/> + <message kind="error" line="7" text="The method m(List<Integer>) in the type Base<Integer> is not applicable for the arguments (List<String>)"/> </compile> </ajc-test> @@ -3445,8 +3450,8 @@ </ajc-test> <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - M"> <compile files="GenericAspectM.aj" options="-1.5"> - <message kind="error" line="23" text="The method m0(Integer) in the type GenericAspect<A,B>.SimpleI<L> is not applicable for the arguments (String)"/> - <message kind="error" line="24" text="The method m1(List<Integer>) in the type GenericAspect<A,B>.SimpleI<L> is not applicable for the arguments (List<String>)"/> + <message kind="error" line="23" text="The method m0(Integer) in the type GenericAspect<A,B>.SimpleI<Integer> is not applicable for the arguments (String)"/> + <message kind="error" line="24" text="The method m1(List<Integer>) in the type GenericAspect<A,B>.SimpleI<Integer> is not applicable for the arguments (List<String>)"/> <message kind="error" line="25" text="Type mismatch: cannot convert from String to Integer"/> <message kind="error" line="26" text="Type mismatch: cannot convert from List<String> to List<Integer>"/> </compile> @@ -3458,7 +3463,7 @@ <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - O"> <compile files="GenericAspectO.aj" options="-1.5"> <message kind="error" line="24" text="Cannot make a static reference to the non-static field Bottom.parent"/> - <message kind="error" line="26" text="The method add(Bottom) in the type List<E> is not applicable for the arguments (Top)"/> + <message kind="error" line="26" text="The method add(Bottom) in the type List<Bottom> is not applicable for the arguments (Top)"/> <message kind="error" line="27" text="Cannot make a static reference to the non-static field Top.children"/> </compile> </ajc-test> diff --git a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java index c5c3024cc..142c055fa 100644 --- a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java +++ b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java @@ -270,17 +270,45 @@ public class AjcMemberMaker { }; // PTWIMPL ResolvedMember for aspectOf(), declared in aspect - public static ResolvedMember perTypeWithinAspectOfMethod(UnresolvedType declaringType) { - return new ResolvedMemberImpl(Member.METHOD, - declaringType, PUBLIC_STATIC, "aspectOf", - "(Ljava/lang/Class;)" + declaringType.getSignature()); + public static ResolvedMember perTypeWithinAspectOfMethod(UnresolvedType declaringType,boolean inJava5Mode) { + UnresolvedType parameterType = null; + if (inJava5Mode) { + parameterType = UnresolvedType.forRawTypeName("java.lang.Class"); + } else { + parameterType = UnresolvedType.forSignature("Ljava/lang/Class;"); + } + return new ResolvedMemberImpl( + Member.METHOD, + declaringType, + PUBLIC_STATIC, + declaringType, + "aspectOf", + new UnresolvedType[] {parameterType} + ); +// return new ResolvedMemberImpl(Member.METHOD, +// declaringType, PUBLIC_STATIC, "aspectOf", +// "(Ljava/lang/Class;)" + declaringType.getSignature()); } // PTWIMPL ResolvedMember for hasAspect(), declared in aspect - public static ResolvedMember perTypeWithinHasAspectMethod(UnresolvedType declaringType) { - return new ResolvedMemberImpl(Member.METHOD, - declaringType, PUBLIC_STATIC, "hasAspect", - "(Ljava/lang/Class;)Z"); + public static ResolvedMember perTypeWithinHasAspectMethod(UnresolvedType declaringType, boolean inJava5Mode) { + UnresolvedType parameterType = null; + if (inJava5Mode) { + parameterType = UnresolvedType.forRawTypeName("java.lang.Class"); + } else { + parameterType = UnresolvedType.forSignature("Ljava/lang/Class;"); + } + return new ResolvedMemberImpl( + Member.METHOD, + declaringType, + PUBLIC_STATIC, + ResolvedType.BOOLEAN, + "hasAspect", + new UnresolvedType[] {parameterType} + ); +// return new ResolvedMemberImpl(Member.METHOD, +// declaringType, PUBLIC_STATIC, "hasAspect", +// "(Ljava/lang/Class;)Z"); }; // -- privileged accessors diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java b/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java index 724c06816..242e8b76d 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java @@ -398,7 +398,7 @@ public class BcelPerClauseAspectAdder extends BcelTypeMunger { private void generatePerTWAspectOfMethod(LazyClassGen classGen) { InstructionFactory factory = classGen.getFactory(); - LazyMethodGen method = makeMethodGen(classGen, AjcMemberMaker.perTypeWithinAspectOfMethod(aspectType)); + LazyMethodGen method = makeMethodGen(classGen, AjcMemberMaker.perTypeWithinAspectOfMethod(aspectType,classGen.getWorld().isInJava5Mode())); flagAsSynthetic(method, false); classGen.addMethodGen(method); @@ -437,7 +437,7 @@ public class BcelPerClauseAspectAdder extends BcelTypeMunger { private void generatePerTWHasAspectMethod(LazyClassGen classGen) { InstructionFactory factory = classGen.getFactory(); - LazyMethodGen method = makeMethodGen(classGen, AjcMemberMaker.perTypeWithinHasAspectMethod(aspectType)); + LazyMethodGen method = makeMethodGen(classGen, AjcMemberMaker.perTypeWithinHasAspectMethod(aspectType,classGen.getWorld().isInJava5Mode())); flagAsSynthetic(method, false); classGen.addMethodGen(method); |