field host for mixin made synthetic

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelField.java b/weaver/src/org/aspectj/weaver/bcel/BcelField.java
index 02da37b90b4665f14320c2ca17251d3f9140eafa..de914f7640aec20926462b9b0c872f9080dffc6f 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelField.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelField.java
@@ -37,7 +37,7 @@ import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXConverter.GenericSigna
 
 final class BcelField extends ResolvedMemberImpl {
 
-       private static int AccSynthetic = 0x1000;
+       public static int AccSynthetic = 0x1000;
 
        private Field field;
        private boolean isAjSynthetic;

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
index c969fe84de714b98c1d34f95a3008f15a5c4f716..5c46ea24e766ea5ac74c61debd2a51b6712426fb 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
@@ -1146,7 +1146,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
         * @param unMangledInterMethod the method to bridge 'to' that we have already created in the 'subtype'
         * @param clazz the class in which to put the bridge method
         * @param paramTypes Parameter types for the bridge method, passed in as an optimization since the caller is likely to have
-        *        already created them.
+        *            already created them.
         * @param theBridgeMethod
         */
        private void createBridgeMethod(BcelWorld world, NewMethodTypeMunger munger, ResolvedMember unMangledInterMethod,
@@ -1396,7 +1396,9 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
                // this?
                ResolvedMember host = AjcMemberMaker.itdAtDeclareParentsField(weaver.getLazyClassGen().getType(), munger.getSignature()
                                .getType(), aspectType);
-               weaver.getLazyClassGen().addField(makeFieldGen(weaver.getLazyClassGen(), host), null);
+               FieldGen field = makeFieldGen(weaver.getLazyClassGen(), host);
+               field.setModifiers(field.getModifiers() | BcelField.AccSynthetic);
+               weaver.getLazyClassGen().addField(field, null);
                return true;
        }