made const fold pass kosher

polyglot-compiler · Nov 13, 2018 · 6bbe01f · 6bbe01f
1 parent 9384f7f
commit 6bbe01f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/compiler/src/jlang/JLangScheduler.java b/compiler/src/jlang/JLangScheduler.java
@@ -104,8 +104,15 @@ public Goal JLangConstFold(Job job) {
         ExtensionInfo extInfo = job.extensionInfo();
         JLangTypeSystem ts = (JLangTypeSystem) extInfo.typeSystem();
         JLangNodeFactory nf = (JLangNodeFactory) extInfo.nodeFactory();
-        return new VisitorGoal(job, new StringLitFold(ts, nf));
-
+        Goal constGoal = new VisitorGoal(job, new StringLitFold(ts, nf));
+        try {
+            // ensure all desugaring is done for the file (might generate more constants)
+            constGoal.addPrerequisiteGoal(LLVMDesugared(job), this);
+        } catch (CyclicDependencyException e) {
+            throw new InternalCompilerError(e);
+        }
+        // intern goal to remove duplicate objects being created (explicit singleton)
+        return internGoal(constGoal);
     }
 
     @Override