AspectJ6: expected results changed as compiler output has changed slightly

diff --git a/tests/features152/synchronization/transformed/expected/Investigation.b.txt b/tests/features152/synchronization/transformed/expected/Investigation.b.txt
index 15f83a1d6438b6b9d2bb8d79f19711227804e17b..46d76f64adabd59d25d8825e549fd56dc1da9e61 100644 (file)
--- a/tests/features152/synchronization/transformed/expected/Investigation.b.txt
+++ b/tests/features152/synchronization/transformed/expected/Investigation.b.txt
@@ -1,4 +1,4 @@
-  public void b()    org.aspectj.weaver.MethodDeclarationLineNumber: 19:312
+  public void b()    org.aspectj.weaver.MethodDeclarationLineNumber: 19:294
 :
                     ALOAD_0     // LInvestigation; this   (line 20)
                     DUP

diff --git a/tests/features152/synchronization/transformed/expected/Investigation.c.txt b/tests/features152/synchronization/transformed/expected/Investigation.c.txt
index 7fa235d5dd13c2a8df1b7ba295c876b7832f92bf..1bd977fd05ace14d5661b1170637b2c4a7ffed62 100644 (file)
--- a/tests/features152/synchronization/transformed/expected/Investigation.c.txt
+++ b/tests/features152/synchronization/transformed/expected/Investigation.c.txt
@@ -1,4 +1,4 @@
-  public void c()    org.aspectj.weaver.MethodDeclarationLineNumber: 26:439
+  public void c()    org.aspectj.weaver.MethodDeclarationLineNumber: 26:414
 :
                     ALOAD_0     // LInvestigation; this   (line 27)
                     DUP
@@ -16,8 +16,8 @@
     | |             ALOAD_2     // Ljava/io/File; f
     | |             INVOKESPECIAL java.io.FileInputStream.<init> (Ljava/io/File;)V
     | |             POP
-    | |             GOTO L0
     | catch java.io.IOException -> E0
+    |               GOTO L0
     |           E0: POP   (line 31)
     |               GETSTATIC java.lang.System.out Ljava/io/PrintStream;   (line 32)
     |               LDC "bang"

diff --git a/tests/features152/synchronization/transformed/expected/Investigation.d.txt b/tests/features152/synchronization/transformed/expected/Investigation.d.txt
index a2a73c36ae043a386f0a7d684b2c464c3d7d411e..a5a0bb4e4b49945fb685cf40d7a1fefd764b1b2f 100644 (file)
--- a/tests/features152/synchronization/transformed/expected/Investigation.d.txt
+++ b/tests/features152/synchronization/transformed/expected/Investigation.d.txt
@@ -1,4 +1,4 @@
-  public void d()    org.aspectj.weaver.MethodDeclarationLineNumber: 38:706
+  public void d()    org.aspectj.weaver.MethodDeclarationLineNumber: 38:669
 :
                     ALOAD_0     // LInvestigation; this   (line 39)
                     DUP

diff --git a/tests/features152/synchronization/transformed/expected/Investigation.e.txt b/tests/features152/synchronization/transformed/expected/Investigation.e.txt
index 6508daf3a921516637d49862f65d4b8b69b0c2df..7df70b805e3d9efefca3a3c98cf821028f9cf4de 100644 (file)
--- a/tests/features152/synchronization/transformed/expected/Investigation.e.txt
+++ b/tests/features152/synchronization/transformed/expected/Investigation.e.txt
@@ -1,4 +1,4 @@
-  public void e()    org.aspectj.weaver.MethodDeclarationLineNumber: 48:904
+  public void e()    org.aspectj.weaver.MethodDeclarationLineNumber: 48:857
 :
                     ALOAD_0     // LInvestigation; this   (line 49)
                     DUP

diff --git a/tests/features152/synchronization/transformed/expected/One.b.txt b/tests/features152/synchronization/transformed/expected/One.b.txt
index 948cb66cda18173c3a0cfb1c0e597b269eb51ccb..5cef0d35f68bf39b21cd8ec33bd959a80a79575d 100644 (file)
--- a/tests/features152/synchronization/transformed/expected/One.b.txt
+++ b/tests/features152/synchronization/transformed/expected/One.b.txt
@@ -1,4 +1,4 @@
-  public void b()    org.aspectj.weaver.MethodDeclarationLineNumber: 13:259
+  public void b()    org.aspectj.weaver.MethodDeclarationLineNumber: 13:247
 :
                     ALOAD_0
                     DUP

diff --git a/tests/features152/synchronization/transformed/expected/One.c.txt b/tests/features152/synchronization/transformed/expected/One.c.txt
index 3641c9b3603719aa3ef001ac9e1867fdb813be27..e96e42b073fbb79603ab5889782a60bd64879c71 100644 (file)
--- a/tests/features152/synchronization/transformed/expected/One.c.txt
+++ b/tests/features152/synchronization/transformed/expected/One.c.txt
@@ -1,4 +1,4 @@
-  public void c()    org.aspectj.weaver.MethodDeclarationLineNumber: 18:368
+  public void c()    org.aspectj.weaver.MethodDeclarationLineNumber: 18:351
 :
                     ALOAD_0
                     DUP
@@ -16,8 +16,8 @@
     | |             ALOAD_1     // Ljava/io/File; f
     | |             INVOKESPECIAL java.io.FileInputStream.<init> (Ljava/io/File;)V
     | |             POP
-    | |             GOTO L0
     | catch java.io.IOException -> E0
+    |               GOTO L0
     |           E0: POP   (line 22)
     |               GETSTATIC java.lang.System.out Ljava/io/PrintStream;   (line 23)
     |               LDC "bang"

diff --git a/tests/features152/synchronization/transformed/expected/One.e.txt b/tests/features152/synchronization/transformed/expected/One.e.txt
index 85d93f0ed9ba90d779a0f7275509fd21c87ab0b2..e11432b18169867187dae0124201ecbbaae3b6da 100644 (file)
--- a/tests/features152/synchronization/transformed/expected/One.e.txt
+++ b/tests/features152/synchronization/transformed/expected/One.e.txt
@@ -1,4 +1,4 @@
-  public void e()    org.aspectj.weaver.MethodDeclarationLineNumber: 28:611
+  public void e()    org.aspectj.weaver.MethodDeclarationLineNumber: 28:584
 :
                     ALOAD_0
                     DUP