commit f027763a05bdf16caed42cf46db6efd67a3235fa
author Christoffer Quist Adamsen <christofferqa@google.com> Fri May 12 12:25:55 2023 +0200
committer Christoffer Adamsen <christofferqa@google.com> Fri May 12 10:26:13 2023 +0000
tree fed18635d4cfc03e2bae193a82cb1ffbfe276dda
parent f392fc546b41797a2ed949b4970e93d0359aa1cf

Move finalizing of fields to after IR conversion

Change-Id: Iac1388bd2ffa41e81208bac0edf6d93cc47bff2b

src/test/examples/classmerging/ConflictInGeneratedNameTest.java

diff --git a/src/test/examples/classmerging/ConflictInGeneratedNameTest.java b/src/test/examples/classmerging/ConflictInGeneratedNameTest.java
index 4ef0b3e..528f9bf 100644
--- a/src/test/examples/classmerging/ConflictInGeneratedNameTest.java
+++ b/src/test/examples/classmerging/ConflictInGeneratedNameTest.java
@@ -4,6 +4,7 @@
 
 package classmerging;
 
+
 public class ConflictInGeneratedNameTest {
   public static void main(String[] args) {
     B obj = new B();
@@ -11,7 +12,7 @@
   }
 
   public static class A {
-    @NeverPropagateValue private String name = "A";
+    @NeverPropagateValue @NoRedundantFieldLoadElimination private String name = "A";
 
     public A() {
       print("In A.<init>()");
@@ -56,8 +57,10 @@
   }
 
   public static class B extends A {
-    @NeverPropagateValue private String name = "B";
-    @NeverPropagateValue private String name$classmerging$ConflictInGeneratedNameTest$A = "C";
+    @NeverPropagateValue @NoRedundantFieldLoadElimination private String name = "B";
+
+    @NeverPropagateValue @NoRedundantFieldLoadElimination
+    private String name$classmerging$ConflictInGeneratedNameTest$A = "C";
 
     public B() {
       print("In B.<init>()");