aboutsummaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authorAndy Clement <aclement@gopivotal.com>2015-05-15 08:20:50 -0700
committerAndy Clement <aclement@gopivotal.com>2015-05-15 08:20:50 -0700
commit066dc11d46731d5a60866dc1ded2dd3e3ef2fcd0 (patch)
treed1041d4b4f117b419c7ebaaca5a941033175f7ed /weaver
parentef453a5ff86b4cf84e0d7845f7233fa1f0b3907b (diff)
downloadaspectj-066dc11d46731d5a60866dc1ded2dd3e3ef2fcd0.tar.gz
aspectj-066dc11d46731d5a60866dc1ded2dd3e3ef2fcd0.zip
Bug 467415 - Weaver created bridge methods missing ACC_SYNTHETIC
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java2
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
index 3163e7f37..88b1090c2 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
@@ -360,7 +360,7 @@ class BcelClassWeaver implements IClassWeaver {
}
// The bridge method in this type will have the same signature as the one in the supertype
LazyMethodGen bridgeMethod = makeBridgeMethod(clazz, theBridgeMethod);
- int newflags = bridgeMethod.getAccessFlags() | 0x00000040;// BRIDGE = 0x00000040
+ int newflags = bridgeMethod.getAccessFlags() | Constants.ACC_BRIDGE | Constants.ACC_SYNTHETIC ;// BRIDGE = 0x00000040
if ((newflags & 0x00000100) != 0) {
newflags = newflags - 0x100;// NATIVE = 0x00000100 - need to clear it
diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
index ea0248335..a5f042a5e 100644
--- a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
@@ -77,7 +77,6 @@ import org.aspectj.weaver.tools.Traceable;
* We stay away from targeters for rangey things like Shadows and Exceptions.
*/
public final class LazyMethodGen implements Traceable {
- private static final int ACC_SYNTHETIC = 0x1000;
private int modifiers;
private Type returnType;
@@ -995,7 +994,7 @@ public final class LazyMethodGen implements Traceable {
if (isSynthetic) {
if (enclosingClass.getWorld().isInJava5Mode()) {
- gen.setModifiers(gen.getModifiers() | ACC_SYNTHETIC);
+ gen.setModifiers(gen.getModifiers() | Constants.ACC_SYNTHETIC);
}
if (!hasAttribute("Synthetic")) {
// belt and braces, do the attribute even on Java 5 in addition to the modifier flag