Merge pull request #102 from grin-compiler/32-trf-sync

Extended Syntax: GRIN transformations SYNC
grin-compiler · May 10, 2020 · d4dd1c9 · d4dd1c9
2 parents 6d76113 + fe2fbd5
commit d4dd1c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/grin/grin.cabal b/grin/grin.cabal
@@ -152,12 +152,12 @@ library
     Transformations.ExtendedSyntax.Optimising.CopyPropagation
     Transformations.ExtendedSyntax.Optimising.ConstantPropagation
     Transformations.ExtendedSyntax.Optimising.CSE
-    Transformations.ExtendedSyntax.Optimising.DeadDataElimination
     Transformations.ExtendedSyntax.Optimising.DeadFunctionElimination
+    Transformations.ExtendedSyntax.Optimising.DeadDataElimination
     Transformations.ExtendedSyntax.Optimising.DeadParameterElimination
     Transformations.ExtendedSyntax.Optimising.EvaluatedCaseElimination
-    Transformations.ExtendedSyntax.Optimising.Inlining
     Transformations.ExtendedSyntax.Optimising.GeneralizedUnboxing
+    Transformations.ExtendedSyntax.Optimising.Inlining
     Transformations.ExtendedSyntax.Optimising.NonSharedElimination
     Transformations.ExtendedSyntax.Optimising.SimpleDeadFunctionElimination
     Transformations.ExtendedSyntax.Optimising.SimpleDeadParameterElimination
@@ -318,14 +318,15 @@ test-suite grin-test
                      Transformations.ExtendedSyntax.Optimising.ArityRaisingSpec
                      Transformations.ExtendedSyntax.Optimising.CaseCopyPropagationSpec
                      Transformations.ExtendedSyntax.Optimising.CaseHoistingSpec
+                     Transformations.ExtendedSyntax.Optimising.ConstantPropagationSpec
                      Transformations.ExtendedSyntax.Optimising.CopyPropagationSpec
                      Transformations.ExtendedSyntax.Optimising.CSESpec
                      Transformations.ExtendedSyntax.Optimising.DeadDataEliminationSpec
                      Transformations.ExtendedSyntax.Optimising.DeadFunctionEliminationSpec
                      Transformations.ExtendedSyntax.Optimising.DeadParameterEliminationSpec
                      Transformations.ExtendedSyntax.Optimising.EvaluatedCaseEliminationSpec
-                     Transformations.ExtendedSyntax.Optimising.InliningSpec
                      Transformations.ExtendedSyntax.Optimising.GeneralizedUnboxingSpec
+                     Transformations.ExtendedSyntax.Optimising.InliningSpec
                      Transformations.ExtendedSyntax.Optimising.NonSharedEliminationSpec
                      Transformations.ExtendedSyntax.Optimising.SimpleDeadFunctionEliminationSpec
                      Transformations.ExtendedSyntax.Optimising.SimpleDeadParameterEliminationSpec

diff --git a/grin/src/Transformations/ExtendedSyntax/Optimising/ConstantPropagation.hs b/grin/src/Transformations/ExtendedSyntax/Optimising/ConstantPropagation.hs
@@ -28,8 +28,8 @@ constantPropagation e = ana builder (mempty, e) where
 
   builder :: (Env, Exp) -> ExpF (Env, Exp)
   builder (env, exp) = case exp of
-    ECase scrut alts ->
-      let constVal      = getValue scrut env
+    ECase scrut alts -> -- val ~ scrut
+      let constVal      = getValue scrut env -- error "substValsVal env val"
           known         = isKnown constVal || Map.member scrut env
           matchingAlts  = [alt | alt@(Alt cpat name body) <- alts, match cpat constVal]
           defaultAlts   = [alt | alt@(Alt DefaultPat name body) <- alts]