218167: test and fix: compiler crash on multiple dec @fields

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
index 1acf634fbdc7dd401dd68f3824a0b3e0a2b94a43..a486c5a72b51335d1796c7313f6c6d4c8317fe06 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
@@ -1065,7 +1065,7 @@ class BcelClassWeaver implements IClassWeaver {
                    while (!worthRetrying.isEmpty() && modificationOccured) {
                                modificationOccured = false;
                 List forRemoval = new ArrayList();
-                for (Iterator iter2 = worthRetrying.iterator(); iter.hasNext();) {
+                for (Iterator iter2 = worthRetrying.iterator(); iter2.hasNext();) {
                                  DeclareAnnotation decaMC = (DeclareAnnotation) iter2.next();
                                  if (decaMC.matches(unMangledInterMethod,world)) {
                                        LazyMethodGen annotationHolder = locateAnnotationHolderForFieldMunger(clazz,methodctorMunger);
@@ -1311,7 +1311,7 @@ class BcelClassWeaver implements IClassWeaver {
                                          reportedProblems.add(uniqueID);
                                          reportedProblems.add(new Integer(itdfieldsig.hashCode()*deca.hashCode()));
                                          world.getLint().elementAlreadyAnnotated.signal(
-                                               new String[]{rm.toString(),deca.getAnnotationTypeX().toString()},
+                                               new String[]{itdfieldsig.toString(),deca.getAnnotationTypeX().toString()},
                                                rm.getSourceLocation(),new ISourceLocation[]{deca.getSourceLocation()});
                                  }
                          }