test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueOops.java

*** 116,139 ****
          s = ObjectWithObjectValues.class.toString();
      }
  
  
      static class Couple {
!         public Person onePerson;
!         public Person otherPerson;
      }
  
      static final __ByValue class Composition {
!         public final Person onePerson;
!         public final Person otherPerson;
  
          private Composition() {
!             this.onePerson   = Person.create(0, null, null);
!             this.otherPerson = Person.create(0, null, null);
          }
  
!         __ValueFactory public static Composition create(Person onePerson, Person otherPerson) {
              Composition comp = __MakeDefault Composition();
              comp.onePerson   = onePerson;
              comp.otherPerson = otherPerson;
              return comp;
          }
--- 116,139 ----
          s = ObjectWithObjectValues.class.toString();
      }
  
  
      static class Couple {
!         __Flattenable public Person onePerson;
!         __Flattenable public Person otherPerson;
      }
  
      static final __ByValue class Composition {
!         __Flattenable public final Person onePerson;
!         __Flattenable public final Person otherPerson;
  
          private Composition() {
!             onePerson   = Person.create(0, null, null);
!             otherPerson = Person.create(0, null, null);
          }
  
!         public static Composition create(Person onePerson, Person otherPerson) {
              Composition comp = __MakeDefault Composition();
              comp.onePerson   = onePerson;
              comp.otherPerson = otherPerson;
              return comp;
          }
*** 517,528 ****
      // Various field layouts...sanity testing, see MVTCombo testing for full-set
  
      static final __ByValue class ObjectValue {
          final Object object;
  
!         private ObjectValue(Object object) {
!             this.object = object;
          }
      }
  
      static class ObjectWithObjectValue {
          ObjectValue value1;
--- 517,528 ----
      // Various field layouts...sanity testing, see MVTCombo testing for full-set
  
      static final __ByValue class ObjectValue {
          final Object object;
  
!         private ObjectValue(Object obj) {
!             object = obj;
          }
      }
  
      static class ObjectWithObjectValue {
          ObjectValue value1;
*** 556,573 ****
          public final String description;
          public final long timestamp;
          public final String notes;
  
          private FooValue() {
!             this.id          = 0;
!             this.name        = null;
!             this.description = null;
!             this.timestamp   = 0L;
!             this.notes       = null;
          }
  
!         __ValueFactory public static FooValue create(int id, String name, String description, long timestamp, String notes) {
              FooValue f = __MakeDefault FooValue();
              f.id          = id;
              f.name        = name;
              f.description = description;
              f.timestamp   = timestamp;
--- 556,573 ----
          public final String description;
          public final long timestamp;
          public final String notes;
  
          private FooValue() {
!             id          = 0;
!             name        = null;
!             description = null;
!             timestamp   = 0L;
!             notes       = null;
          }
  
!         public static FooValue create(int id, String name, String description, long timestamp, String notes) {
              FooValue f = __MakeDefault FooValue();
              f.id          = id;
              f.name        = name;
              f.description = description;
              f.timestamp   = timestamp;
*** 639,668 ****
              } catch (Throwable t) { fail("exerciseVBytecodeExprStackWithRefs", t); }
          }
      }
  
      static class BarWithValue {
!         FooValue foo;
          long extendedId;
          String moreNotes;
          int count;
          String otherStuff;
      }
  
      static final __ByValue class BarValue {
!         final FooValue foo;
          final long extendedId;
          final String moreNotes;
          final int count;
          final String otherStuff;
  
!         private BarValue(FooValue foo, long extendedId, String moreNotes, int count, String otherStuff) {
!             this.foo = foo;
!             this.extendedId = extendedId;
!             this.moreNotes = moreNotes;
!             this.count = count;
!             this.otherStuff = otherStuff;
          }
      }
  
  }
  
--- 639,668 ----
              } catch (Throwable t) { fail("exerciseVBytecodeExprStackWithRefs", t); }
          }
      }
  
      static class BarWithValue {
!         __Flattenable FooValue foo;
          long extendedId;
          String moreNotes;
          int count;
          String otherStuff;
      }
  
      static final __ByValue class BarValue {
!         __Flattenable final FooValue foo;
          final long extendedId;
          final String moreNotes;
          final int count;
          final String otherStuff;
  
!         private BarValue(FooValue f, long extId, String mNotes, int c, String other) {
!             foo = f;
!             extendedId = extId;
!             moreNotes = mNotes;
!             count = c;
!             otherStuff = other;
          }
      }
  
  }