refraining from removing NOPs at thistime

diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
index 5b4ef7d9d093a9009a72a253e033f1a666893f17..b7c46d50a9260415d3ef4362b598f6ec3ed75b69 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
@@ -348,7 +348,7 @@ public final class LazyMethodGen {
         }
 
         void run() {
-               killNops();
+               //killNops();
             assignLabels();
             print();
         }
@@ -810,28 +810,29 @@ public final class LazyMethodGen {
 
     }
 
-
-       public void killNops() {
-       InstructionHandle curr = body.getStart();
-       while (true) {
-                       if (curr == null) break;
-                       InstructionHandle next = curr.getNext();
-               if (curr.getInstruction() instanceof NOP) {
-                       InstructionTargeter[] targeters = curr.getTargeters();
-                       if (targeters != null) {
-                               for (int i = 0, len = targeters.length; i < len; i++) {
-                                               InstructionTargeter targeter = targeters[i];
-                                               targeter.updateTarget(curr, next);
-                               }
-                       }
-                               try {
-                                       body.delete(curr);
-                               } catch (TargetLostException e) {
-                               }
-               }
-                       curr = next;
-       }
-       }
+       /** This proedure should not currently be used.
+        */
+//     public void killNops() {
+//     InstructionHandle curr = body.getStart();
+//     while (true) {
+//                     if (curr == null) break;
+//                     InstructionHandle next = curr.getNext();
+//             if (curr.getInstruction() instanceof NOP) {
+//                     InstructionTargeter[] targeters = curr.getTargeters();
+//                     if (targeters != null) {
+//                             for (int i = 0, len = targeters.length; i < len; i++) {
+//                                             InstructionTargeter targeter = targeters[i];
+//                                             targeter.updateTarget(curr, next);
+//                             }
+//                     }
+//                             try {
+//                                     body.delete(curr);
+//                             } catch (TargetLostException e) {
+//                             }
+//             }
+//                     curr = next;
+//     }
+//     }
 
     private static InstructionHandle remap(InstructionHandle ih, Map map) {
         while (true) {