From: aclement Date: Fri, 5 Aug 2011 16:06:06 +0000 (+0000) Subject: 353936 X-Git-Tag: V1_6_12M2~50 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=529dc748a63e8ff0358bacf04ee23f6e2f3a43f4;p=aspectj.git 353936 --- diff --git a/tests/features152/synchronization/transformed/expected/C.b.txt b/tests/features152/synchronization/transformed/expected/C.b.txt index 15f85674d..d32cff208 100644 --- a/tests/features152/synchronization/transformed/expected/C.b.txt +++ b/tests/features152/synchronization/transformed/expected/C.b.txt @@ -1,4 +1,4 @@ - public static void b() org.aspectj.weaver.MethodDeclarationLineNumber: 17:340 + public static void b() org.aspectj.weaver.MethodDeclarationLineNumber: 17:324 : LDC C DUP diff --git a/tests/features152/synchronization/transformed/expected/C.bbb.txt b/tests/features152/synchronization/transformed/expected/C.bbb.txt index b9f54d8eb..079103a08 100644 --- a/tests/features152/synchronization/transformed/expected/C.bbb.txt +++ b/tests/features152/synchronization/transformed/expected/C.bbb.txt @@ -1,4 +1,4 @@ - public static void bbb() org.aspectj.weaver.MethodDeclarationLineNumber: 15:316 + public static void bbb() org.aspectj.weaver.MethodDeclarationLineNumber: 15:302 : GETSTATIC C.class$1 Ljava/lang/Class; DUP diff --git a/tests/features152/synchronization/transformed/expected/C.m.txt b/tests/features152/synchronization/transformed/expected/C.m.txt index 7f5a34cdc..a9e901519 100644 --- a/tests/features152/synchronization/transformed/expected/C.m.txt +++ b/tests/features152/synchronization/transformed/expected/C.m.txt @@ -1,6 +1,6 @@ - public void m() org.aspectj.weaver.MethodDeclarationLineNumber: 16:496 + public void m() org.aspectj.weaver.MethodDeclarationLineNumber: 16:481 : - ALOAD_0 + ALOAD_0 // LC; this DUP ASTORE_1 MONITORENTER diff --git a/tests/features152/synchronization/transformed/expected/C.m2.txt b/tests/features152/synchronization/transformed/expected/C.m2.txt index ab4a19919..6817257a2 100644 --- a/tests/features152/synchronization/transformed/expected/C.m2.txt +++ b/tests/features152/synchronization/transformed/expected/C.m2.txt @@ -1,7 +1,7 @@ - public void m2() org.aspectj.weaver.MethodDeclarationLineNumber: 20:571 + public void m2() org.aspectj.weaver.MethodDeclarationLineNumber: 20:552 : catch java.lang.Throwable -> E2 - | ALOAD_0 + | ALOAD_0 // LC; this | DUP | ASTORE_1 | MONITORENTER diff --git a/tests/features152/synchronization/transformed/expected/C.m3.txt b/tests/features152/synchronization/transformed/expected/C.m3.txt index f1157285e..ec67a8c57 100644 --- a/tests/features152/synchronization/transformed/expected/C.m3.txt +++ b/tests/features152/synchronization/transformed/expected/C.m3.txt @@ -1,6 +1,6 @@ - public void m3() org.aspectj.weaver.MethodDeclarationLineNumber: 20:747 + public void m3() org.aspectj.weaver.MethodDeclarationLineNumber: 20:728 : - ALOAD_0 + ALOAD_0 // LC; this DUP ASTORE_1 MONITORENTER diff --git a/tests/features152/synchronization/transformed/expected/C.m32.txt b/tests/features152/synchronization/transformed/expected/C.m32.txt index 0e2819293..2e6b16723 100644 --- a/tests/features152/synchronization/transformed/expected/C.m32.txt +++ b/tests/features152/synchronization/transformed/expected/C.m32.txt @@ -1,7 +1,7 @@ - public void m32() org.aspectj.weaver.MethodDeclarationLineNumber: 24:823 + public void m32() org.aspectj.weaver.MethodDeclarationLineNumber: 24:800 : catch java.lang.Throwable -> E2 - | ALOAD_0 + | ALOAD_0 // LC; this | DUP | ASTORE_1 | MONITORENTER diff --git a/tests/features152/synchronization/transformed/expected/C.m33.txt b/tests/features152/synchronization/transformed/expected/C.m33.txt index 6f09fc98a..302a7d9cd 100644 --- a/tests/features152/synchronization/transformed/expected/C.m33.txt +++ b/tests/features152/synchronization/transformed/expected/C.m33.txt @@ -1,4 +1,4 @@ - public void m33() org.aspectj.weaver.MethodDeclarationLineNumber: 29:917 + public void m33() org.aspectj.weaver.MethodDeclarationLineNumber: 29:889 : ALOAD_0 // LC; this (line 30) DUP diff --git a/tests/features152/synchronization/transformed/expected/C.m34.txt b/tests/features152/synchronization/transformed/expected/C.m34.txt index c787ba249..d5336b12e 100644 --- a/tests/features152/synchronization/transformed/expected/C.m34.txt +++ b/tests/features152/synchronization/transformed/expected/C.m34.txt @@ -1,4 +1,4 @@ - public void m34() org.aspectj.weaver.MethodDeclarationLineNumber: 35:1018 + public void m34() org.aspectj.weaver.MethodDeclarationLineNumber: 35:984 : catch java.lang.Throwable -> E1 | ALOAD_0 // LC; this (line 36) diff --git a/tests/features152/synchronization/transformed/expected/C.ma.txt b/tests/features152/synchronization/transformed/expected/C.ma.txt index 6986067b5..024ba6a81 100644 --- a/tests/features152/synchronization/transformed/expected/C.ma.txt +++ b/tests/features152/synchronization/transformed/expected/C.ma.txt @@ -1,4 +1,4 @@ - public void ma() org.aspectj.weaver.MethodDeclarationLineNumber: 14:307 + public void ma() org.aspectj.weaver.MethodDeclarationLineNumber: 14:294 : INVOKESTATIC Two.aspectOf ()LTwo; (line 15) INVOKEVIRTUAL Two.ajc$before$Two$1$8d8821ee ()V diff --git a/tests/features152/synchronization/transformed/expected/One.b.txt b/tests/features152/synchronization/transformed/expected/One.b.txt index 5cef0d35f..65eccc698 100644 --- a/tests/features152/synchronization/transformed/expected/One.b.txt +++ b/tests/features152/synchronization/transformed/expected/One.b.txt @@ -1,6 +1,6 @@ public void b() org.aspectj.weaver.MethodDeclarationLineNumber: 13:247 : - ALOAD_0 + ALOAD_0 // LOne; this DUP ASTORE_1 MONITORENTER diff --git a/tests/features152/synchronization/transformed/expected/One.c.txt b/tests/features152/synchronization/transformed/expected/One.c.txt index e96e42b07..08d44ddee 100644 --- a/tests/features152/synchronization/transformed/expected/One.c.txt +++ b/tests/features152/synchronization/transformed/expected/One.c.txt @@ -1,6 +1,6 @@ public void c() org.aspectj.weaver.MethodDeclarationLineNumber: 18:351 : - ALOAD_0 + ALOAD_0 // LOne; this DUP ASTORE_2 MONITORENTER diff --git a/tests/features152/synchronization/transformed/expected/One.e.txt b/tests/features152/synchronization/transformed/expected/One.e.txt index e11432b18..74de5d575 100644 --- a/tests/features152/synchronization/transformed/expected/One.e.txt +++ b/tests/features152/synchronization/transformed/expected/One.e.txt @@ -1,6 +1,6 @@ public void e() org.aspectj.weaver.MethodDeclarationLineNumber: 28:584 : - ALOAD_0 + ALOAD_0 // LOne; this DUP ASTORE_2 MONITORENTER