mirrors
/
org.aspectj
mirror of https://github.com/eclipse/org.aspectj.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 139 Wiki Activity
Browse Source

fix and testcode update for: 151673: after advice sometimes woven incorrectly into strangely formed input bytecode

tags/PRE_PIPELINE
aclement 18 years ago
parent
db06666e1c
commit
e4ab0ae576
13 changed files with 21 additions and 19 deletions
Split View Show Diff Stats
  1. 0
    1
      tests/features152/synchronization/transformed/expected/C.m.txt
  2. 0
    1
      tests/features152/synchronization/transformed/expected/C.m3.txt
  3. 0
    1
      tests/features152/synchronization/transformed/expected/C.m33.txt
  4. 21
    3
      weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
  5. 0
    2
      weaver/testdata/AfterFancyHelloWorld.txt
  6. 0
    2
      weaver/testdata/AfterHelloWorld.txt
  7. 0
    2
      weaver/testdata/AfterReturningFancyHelloWorld.txt
  8. 0
    2
      weaver/testdata/AfterReturningHelloWorld.txt
  9. 0
    1
      weaver/testdata/ArgsAfterReturningFancyHelloWorld.txt
  10. 0
    1
      weaver/testdata/ArgsAfterReturningHelloWorld.txt
  11. 0
    1
      weaver/testdata/ArgsBeforeAfterHelloWorld.txt
  12. 0
    1
      weaver/testdata/CflowNonStaticBeforeFancyHelloWorld.txt
  13. 0
    1
      weaver/testdata/CflowNonStaticBeforeHelloWorld.txt

+ 0
- 1
tests/features152/synchronization/transformed/expected/C.m.txt View File

@@ -20,5 +20,4 @@
L0: INVOKESTATIC Four.aspectOf ()LFour;
INVOKEVIRTUAL Four.ajc$afterReturning$Four$1$c2776aed ()V
RETURN
RETURN
end public void m()

+ 0
- 1
tests/features152/synchronization/transformed/expected/C.m3.txt View File

@@ -20,5 +20,4 @@
L0: INVOKESTATIC Three.aspectOf ()LThree;
INVOKEVIRTUAL Three.ajc$afterReturning$Three$1$3f09355c ()V
RETURN
RETURN
end public void m3()

+ 0
- 1
tests/features152/synchronization/transformed/expected/C.m33.txt View File

@@ -21,5 +21,4 @@
INVOKESTATIC Three.aspectOf ()LThree;
INVOKEVIRTUAL Three.ajc$afterReturning$Three$3$b48e4ae1 ()V
RETURN
RETURN
end public void m33()

+ 21
- 3
weaver/src/org/aspectj/weaver/bcel/BcelShadow.java View File

@@ -49,6 +49,7 @@ import org.aspectj.apache.bcel.generic.MULTIANEWARRAY;
import org.aspectj.apache.bcel.generic.NEW;
import org.aspectj.apache.bcel.generic.ObjectType;
import org.aspectj.apache.bcel.generic.PUSH;
import org.aspectj.apache.bcel.generic.RETURN;
import org.aspectj.apache.bcel.generic.ReturnInstruction;
import org.aspectj.apache.bcel.generic.SWAP;
import org.aspectj.apache.bcel.generic.StoreInstruction;
@@ -1792,6 +1793,12 @@ public class BcelShadow extends Shadow {
* variable to hold the return value, and load the value from this var before
* returning (see pr148007 for why we do this - it works around a JRockit bug,
* and is also closer to what javac generates)
*
* Sometimes the 'last return' isnt the right one - some rogue code can
* include the real return from the body of a subroutine that exists at the end
* of the method. In this case the last return is RETURN but that may not be
* correct for a method with a non-void return type... pr151673
*
* @param returns list of all the return instructions in the shadow
* @param returnInstructions instruction list into which the return instructions should
* be generated
@@ -1799,15 +1806,26 @@ public class BcelShadow extends Shadow {
*/
private BcelVar generateReturnInstructions(List returns, InstructionList returnInstructions) {
BcelVar returnValueVar = null;
InstructionHandle lastReturnHandle = (InstructionHandle)returns.get(returns.size() - 1);
Instruction newReturnInstruction = Utility.copyInstruction(lastReturnHandle.getInstruction());
if (this.hasANonVoidReturnType()) {
// Find the last *correct* return - this is a method with a non-void return type
// so ignore RETURN
Instruction newReturnInstruction = null;
int i=returns.size()-1;
while (newReturnInstruction == null && i>=0) {
InstructionHandle ih = (InstructionHandle)returns.get(i);
if (!(ih.getInstruction() instanceof RETURN)) {
newReturnInstruction = Utility.copyInstruction(ih.getInstruction());
}
i--;
}
returnValueVar = genTempVar(this.getReturnType());
returnValueVar.appendLoad(returnInstructions,getFactory());
returnInstructions.append(newReturnInstruction);
} else {
InstructionHandle lastReturnHandle = (InstructionHandle)returns.get(returns.size() - 1);
Instruction newReturnInstruction = Utility.copyInstruction(lastReturnHandle.getInstruction());
returnInstructions.append(newReturnInstruction);
}
returnInstructions.append(newReturnInstruction);
return returnValueVar;
}

+ 0
- 2
weaver/testdata/AfterFancyHelloWorld.txt View File

@@ -12,7 +12,6 @@ public abstract class FancyHelloWorld extends java.lang.Object:
| ATHROW
| L0: INVOKESTATIC Aspect.ajc_after_constructor_execution ()V
| RETURN
| RETURN
constructor-execution(void FancyHelloWorld.<init>())
end public void <init>()

@@ -101,7 +100,6 @@ public abstract class FancyHelloWorld extends java.lang.Object:
| ATHROW
| L7: INVOKESTATIC Aspect.ajc_after_method_execution ()V
| RETURN
| RETURN
method-execution(void FancyHelloWorld.main(java.lang.String[]))
end public static void main(String[])


+ 0
- 2
weaver/testdata/AfterHelloWorld.txt View File

@@ -12,7 +12,6 @@ public class HelloWorld extends java.lang.Object:
| ATHROW
| L0: INVOKESTATIC Aspect.ajc_after_constructor_execution ()V
| RETURN
| RETURN
constructor-execution(void HelloWorld.<init>())
end public void <init>()

@@ -54,7 +53,6 @@ public class HelloWorld extends java.lang.Object:
| ATHROW
| L2: INVOKESTATIC Aspect.ajc_after_method_execution ()V
| RETURN
| RETURN
method-execution(void HelloWorld.main(java.lang.String[]))
end public static void main(String[])


+ 0
- 2
weaver/testdata/AfterReturningFancyHelloWorld.txt View File

@@ -6,7 +6,6 @@ public abstract class FancyHelloWorld extends java.lang.Object:
| NOP
| INVOKESTATIC Aspect.ajc_afterReturning_constructor_execution ()V
| RETURN
| RETURN
constructor-execution(void FancyHelloWorld.<init>())
end public void <init>()

@@ -57,7 +56,6 @@ public abstract class FancyHelloWorld extends java.lang.Object:
| L2: NOP (line 17)
| INVOKESTATIC Aspect.ajc_afterReturning_method_execution ()V
| RETURN
| RETURN
method-execution(void FancyHelloWorld.main(java.lang.String[]))
end public static void main(String[])


+ 0
- 2
weaver/testdata/AfterReturningHelloWorld.txt View File

@@ -6,7 +6,6 @@ public class HelloWorld extends java.lang.Object:
| NOP
| INVOKESTATIC Aspect.ajc_afterReturning_constructor_execution ()V
| RETURN
| RETURN
constructor-execution(void HelloWorld.<init>())
end public void <init>()

@@ -26,7 +25,6 @@ public class HelloWorld extends java.lang.Object:
| NOP (line 11)
| INVOKESTATIC Aspect.ajc_afterReturning_method_execution ()V
| RETURN
| RETURN
method-execution(void HelloWorld.main(java.lang.String[]))
end public static void main(String[])


+ 0
- 1
weaver/testdata/ArgsAfterReturningFancyHelloWorld.txt View File

@@ -62,7 +62,6 @@ public abstract class FancyHelloWorld extends java.lang.Object:
| ALOAD 8
| INVOKESTATIC Aspect.ajc_afterReturning_method_execution (Ljava/lang/Object;)V
| RETURN
| RETURN
method-execution(void FancyHelloWorld.main(java.lang.String[]))
end public static void main(String[])


+ 0
- 1
weaver/testdata/ArgsAfterReturningHelloWorld.txt View File

@@ -25,7 +25,6 @@ public class HelloWorld extends java.lang.Object:
| ALOAD_2
| INVOKESTATIC Aspect.ajc_afterReturning_method_execution (Ljava/lang/Object;)V
| RETURN
| RETURN
method-execution(void HelloWorld.main(java.lang.String[]))
end public static void main(String[])


+ 0
- 1
weaver/testdata/ArgsBeforeAfterHelloWorld.txt View File

@@ -45,7 +45,6 @@ public class HelloWorld extends java.lang.Object:
| L1: ALOAD_3
| INVOKESTATIC Aspect.ajc_afterReturning_method_execution (Ljava/lang/Object;)V
| RETURN
| RETURN
method-execution(void HelloWorld.main(java.lang.String[]))
end public static void main(String[])


+ 0
- 1
weaver/testdata/CflowNonStaticBeforeFancyHelloWorld.txt View File

@@ -53,7 +53,6 @@ public abstract class FancyHelloWorld extends java.lang.Object:
| L4: GETSTATIC Aspect.ajc$perCflowStack Lorg/aspectj/runtime/internal/CFlowStack;
| INVOKEVIRTUAL org.aspectj.runtime.internal.CFlowStack.pop ()V
| RETURN
| RETURN
method-execution(void FancyHelloWorld.main(java.lang.String[]))
end public static void main(String[])


+ 0
- 1
weaver/testdata/CflowNonStaticBeforeHelloWorld.txt View File

@@ -30,7 +30,6 @@ public class HelloWorld extends java.lang.Object:
| L1: GETSTATIC Aspect.ajc$perCflowStack Lorg/aspectj/runtime/internal/CFlowStack;
| INVOKEVIRTUAL org.aspectj.runtime.internal.CFlowStack.pop ()V
| RETURN
| RETURN
method-execution(void HelloWorld.main(java.lang.String[]))
end public static void main(String[])


Write Preview
Loading…
Cancel
Save