Fields sorting in HostedUniverse.

Author: Maja Skoko

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java

@@ -630,5 +630,7 @@ public int compare(HostedMethod o1, HostedMethod o2) {
      * keeps the order unchanged and therefore keeps the field order we get from the hosting VM.
      */
     static final Comparator<HostedField> FIELD_COMPARATOR_RELAXED = Comparator.comparing(HostedField::getJavaKind).reversed();
+    static final Comparator<HostedField> FIELD_COMPARATOR_RELAXED_WITH_NAME = Comparator.comparing(HostedField::getJavaKind).reversed()
+                    .thenComparing(m -> m.getDeclaringClass().wrapped.getComparableName()).thenComparing(HostedField::getName);
 
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java

@@ -197,7 +197,7 @@ public void build(DebugContext debug) {
             hUniverse.orderedMethods = new ArrayList<>(hUniverse.methods.values());
             Collections.sort(hUniverse.orderedMethods, HostedUniverse.METHOD_COMPARATOR);
             hUniverse.orderedFields = new ArrayList<>(hUniverse.fields.values());
-            Collections.sort(hUniverse.orderedFields, HostedUniverse.FIELD_COMPARATOR_RELAXED);
+            Collections.sort(hUniverse.orderedFields, HostedUniverse.FIELD_COMPARATOR_RELAXED_WITH_NAME);
             profilingInformationBuildTask.join();
         }
     }
@@ -637,7 +637,7 @@ private void layoutStaticFields() {
         }
 
         // Sort so that a) all Object fields are consecutive, and b) bigger types come first.
-        Collections.sort(fields, HostedUniverse.FIELD_COMPARATOR_RELAXED);
+        Collections.sort(fields, HostedUniverse.FIELD_COMPARATOR_RELAXED_WITH_NAME);
 
         ObjectLayout layout = ConfigurationValues.getObjectLayout();