Make sure the richest constructor (that includes all variables) is us…

…ed by @Persistable
enso-org · Nov 15, 2023 · 5cb4b68 · 5cb4b68
1 parent 95ff6a0
commit 5cb4b68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/engine/runtime/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java b/engine/runtime/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java
@@ -56,6 +56,9 @@ public void testCompareList() throws Exception {
     var meta = new ModuleCache.Metadata("hash", "code", CompilationStage.AFTER_CODEGEN.toString());
     var cachedIr = module.getCache().deserialize(ensoCtx, arr, meta, null);
     assertNotNull("IR read", cachedIr);
-    CompilerTest.assertIR(name, module.getIr(), cachedIr.moduleIR());
+    for (var node : ScalaConversions.asJava(cachedIr.moduleIR().preorder())) {
+      node.passData().prepareForSerialization(ensoCtx.getCompiler().context());
+    }
+    CompilerTest.assertIR(name, ir, cachedIr.moduleIR());
   }
 }
diff --git a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/PersistableProcessor.java b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/PersistableProcessor.java
@@ -91,10 +91,10 @@ private boolean generatePersistance(Element orig, Persistable anno) throws IOExc
         var ea = (ExecutableElement)a;
         var eb = (ExecutableElement)b;
 
-        return ea.getParameters().size() - eb.getParameters().size();
+        return eb.getParameters().size() - ea.getParameters().size();
       })
       .toList();
-    if (constructors.size() == 0) {
+    if (constructors.isEmpty()) {
       processingEnv.getMessager().printMessage(Kind.ERROR, "There should be exactly one constructor in " + typeElem);
       return false;
     }