]> source.dussan.org Git - aspectj.git/commit
tests and "fix" for pr148007 - workaround JRockit "goto" bug by generating code close...
authoracolyer <acolyer>
Thu, 22 Jun 2006 04:49:26 +0000 (04:49 +0000)
committeracolyer <acolyer>
Thu, 22 Jun 2006 04:49:26 +0000 (04:49 +0000)
commit426cbdccfdf8fcfcda07b86d8e524d1034b2d0b7
tree86e17625eadc66a8d7c6d908d5db6c7c746c7eec
parent497dcf1140b7ec4eab3aab80fa5a22c8259bae48
tests and "fix" for pr148007 - workaround JRockit "goto" bug by generating code closer to that produced by javac when weaving after and after returning. In particular: avoid adding a goto that branches to the next instruction (now replaces that return opcode with a nop instead), and store the return value on the top of the stack in a temp before branching to the after advice dispatch and restore it afterwards.
34 files changed:
tests/bugs152/pr148007/purejava/test/BooleanUnitTest.java [new file with mode: 0644]
tests/bugs152/pr148007/purejava/test/LoggingAspect.java [new file with mode: 0644]
tests/bugs152/pr148007/test/BooleanUnitTest.java [new file with mode: 0644]
tests/bugs152/pr148007/test/LoggingAspect.aj [new file with mode: 0644]
tests/bugs152/pr148007/test/TestServlet.java [new file with mode: 0644]
tests/features152/synchronization/transformed/expected/C.m.txt
tests/features152/synchronization/transformed/expected/C.m3.txt
tests/features152/synchronization/transformed/expected/C.m33.txt
tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
weaver/src/org/aspectj/weaver/bcel/Utility.java
weaver/testdata/AfterFancyHelloWorld.txt
weaver/testdata/AfterHelloWorld.txt
weaver/testdata/AfterReturningCheckcastParamFancyHelloWorld.txt
weaver/testdata/AfterReturningCheckcastParamHelloWorld.txt
weaver/testdata/AfterReturningConversionParam.txt
weaver/testdata/AfterReturningFancyHelloWorld.txt
weaver/testdata/AfterReturningHelloWorld.txt
weaver/testdata/AfterReturningParamFancyHelloWorld.txt
weaver/testdata/AfterReturningParamHelloWorld.txt
weaver/testdata/ArgsAfterReturningFancyHelloWorld.txt
weaver/testdata/ArgsAfterReturningHelloWorld.txt
weaver/testdata/ArgsAfterThrowingHelloWorld.txt
weaver/testdata/ArgsBeforeAfterHelloWorld.txt
weaver/testdata/CflowNonStaticBeforeFancyHelloWorld.txt
weaver/testdata/CflowNonStaticBeforeHelloWorld.txt
weaver/testdata/ExtractedFancyHelloWorld.txt
weaver/testdata/ExtractedHelloWorld.txt
weaver/testdata/NonStaticBeforeFancyHelloWorld.txt
weaver/testdata/NonStaticBeforeHelloWorld.txt
weaver/testdata/PerThisNonStaticBeforeFancyHelloWorld.txt
weaver/testdata/PerThisNonStaticBeforeHelloWorld.txt
weaver/testdata/TraceJarHello.txt