Fix ApplyToCase optimization

zliu41 · zliu41 · commit c04c32a5ee74 · 2026-03-11T19:37:36.000-07:00
diff --git a/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.eval b/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.eval
@@ -1,6 +1,6 @@
-CPU:         1_600_998_823_874
-Memory:          4_563_968_578
-AST Size:                3_280
-Flat Size:               5_306
+CPU:         1_600_997_559_874
+Memory:          4_563_960_678
+AST Size:                3_201
+Flat Size:               5_404
 
 (con bool False)
diff --git a/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.uplc b/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.uplc
diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/ApplyToCase.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/ApplyToCase.hs
@@ -40,5 +40,5 @@ processTerm t = case splitApplication t of
   (fun, args)
     | length args >= minArgs ->
         let ann = termAnn t
-         in Case ann (Constr ann 0 (processTerm . snd <$> args)) (V.singleton fun)
+         in Case ann (Constr ann 0 (processTerm . snd <$> args)) (V.singleton (processTerm fun))
   _ -> over termSubterms processTerm t
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt1.golden.eval
@@ -1,6 +1,6 @@
-CPU:               388_324_300
-Memory:              1_167_760
-AST Size:                1_027
-Flat Size:               1_322
+CPU:               388_164_300
+Memory:              1_166_760
+AST Size:                1_025
+Flat Size:               1_323
 
 (con bool False)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt2.golden.eval
@@ -1,6 +1,6 @@
 CPU:               355_465_594
 Memory:              1_057_315
-AST Size:                1_027
-Flat Size:               1_373
+AST Size:                1_025
+Flat Size:               1_374
 
 (con bool False)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt3.golden.eval
@@ -1,6 +1,6 @@
-CPU:               420_218_992
-Memory:              1_283_309
-AST Size:                1_027
-Flat Size:               1_373
+CPU:               420_058_992
+Memory:              1_282_309
+AST Size:                1_025
+Flat Size:               1_374
 
 (con bool True)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt4.golden.eval
@@ -1,6 +1,6 @@
 CPU:               331_580_553
 Memory:                948_636
-AST Size:                1_027
-Flat Size:               1_329
+AST Size:                1_025
+Flat Size:               1_330
 
 (con bool False)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt5.golden.eval
@@ -1,6 +1,6 @@
-CPU:               373_931_011
-Memory:              1_111_024
-AST Size:                1_027
-Flat Size:               1_329
+CPU:               373_835_011
+Memory:              1_110_424
+AST Size:                1_025
+Flat Size:               1_330
 
 (con bool True)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt1.golden.eval
@@ -1,6 +1,6 @@
-CPU:               388_324_300
-Memory:              1_167_760
-AST Size:                1_027
-Flat Size:               1_322
+CPU:               388_164_300
+Memory:              1_166_760
+AST Size:                1_025
+Flat Size:               1_323
 
 (con bool False)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt2.golden.eval
@@ -1,6 +1,6 @@
 CPU:               355_465_594
 Memory:              1_057_315
-AST Size:                1_027
-Flat Size:               1_373
+AST Size:                1_025
+Flat Size:               1_374
 
 (con bool False)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt3.golden.eval
@@ -1,6 +1,6 @@
-CPU:               420_218_992
-Memory:              1_283_309
-AST Size:                1_027
-Flat Size:               1_373
+CPU:               420_058_992
+Memory:              1_282_309
+AST Size:                1_025
+Flat Size:               1_374
 
 (con bool True)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt4.golden.eval
@@ -1,6 +1,6 @@
 CPU:               331_580_553
 Memory:                948_636
-AST Size:                1_027
-Flat Size:               1_329
+AST Size:                1_025
+Flat Size:               1_330
 
 (con bool False)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt5.golden.eval
@@ -1,6 +1,6 @@
-CPU:               373_931_011
-Memory:              1_111_024
-AST Size:                1_027
-Flat Size:               1_329
+CPU:               373_835_011
+Memory:              1_110_424
+AST Size:                1_025
+Flat Size:               1_330
 
 (con bool True)
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Long.golden.stat b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Long.golden.stat
@@ -1,15 +1,15 @@
-({cpu: 6396744758 | mem: 6618883})
-({cpu: 4580966 | mem: 21598})
-({cpu: 4577228781 | mem: 4621623})
-({cpu: 4580966 | mem: 21598})
-({cpu: 4577228781 | mem: 4621623})
-({cpu: 4580966 | mem: 21598})
-({cpu: 2757712804 | mem: 2624363})
-({cpu: 4580966 | mem: 21598})
-({cpu: 4577228781 | mem: 4621623})
-({cpu: 4580966 | mem: 21598})
-({cpu: 2757712804 | mem: 2624363})
-({cpu: 4580966 | mem: 21598})
-({cpu: 2757712804 | mem: 2624363})
-({cpu: 4580966 | mem: 21598})
-({cpu: 938196827 | mem: 627103})
+({cpu: 6392104758 | mem: 6589883})
+({cpu: 4548966 | mem: 21398})
+({cpu: 4573996781 | mem: 4601423})
+({cpu: 4548966 | mem: 21398})
+({cpu: 4573996781 | mem: 4601423})
+({cpu: 4548966 | mem: 21398})
+({cpu: 2755888804 | mem: 2612963})
+({cpu: 4548966 | mem: 21398})
+({cpu: 4573996781 | mem: 4601423})
+({cpu: 4548966 | mem: 21398})
+({cpu: 2755888804 | mem: 2612963})
+({cpu: 4548966 | mem: 21398})
+({cpu: 2755888804 | mem: 2612963})
+({cpu: 4548966 | mem: 21398})
+({cpu: 937780827 | mem: 624503})
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Short.golden.stat b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Short.golden.stat
@@ -1,21 +1,21 @@
 ({cpu: 1360100 | mem: 8600})
 ({cpu: 1912723 | mem: 11932})
-({cpu: 4411889 | mem: 20965})
-({cpu: 4996966 | mem: 24198})
-({cpu: 6692253 | mem: 28231})
-({cpu: 7413953 | mem: 32196})
-({cpu: 12215359 | mem: 47862})
-({cpu: 11497772 | mem: 49394})
-({cpu: 15267148 | mem: 60227})
-({cpu: 9135449 | mem: 35297})
-({cpu: 23261571 | mem: 87124})
-({cpu: 7052283 | mem: 28864})
-({cpu: 33536358 | mem: 121287})
-({cpu: 36443622 | mem: 134613})
-({cpu: 48573898 | mem: 162716})
-({cpu: 51481162 | mem: 176042})
-({cpu: 66082755 | mem: 211411})
-({cpu: 66804455 | mem: 215376})
-({cpu: 86062929 | mem: 267372})
-({cpu: 28991149 | mem: 109276})
-({cpu: 938196827 | mem: 627103})
+({cpu: 4379889 | mem: 20765})
+({cpu: 4964966 | mem: 23998})
+({cpu: 6660253 | mem: 28031})
+({cpu: 7381953 | mem: 31996})
+({cpu: 12151359 | mem: 47462})
+({cpu: 11433772 | mem: 48994})
+({cpu: 15171148 | mem: 59627})
+({cpu: 9103449 | mem: 35097})
+({cpu: 23133571 | mem: 86324})
+({cpu: 7020283 | mem: 28664})
+({cpu: 33376358 | mem: 120287})
+({cpu: 36315622 | mem: 133813})
+({cpu: 48381898 | mem: 161516})
+({cpu: 51321162 | mem: 175042})
+({cpu: 65858755 | mem: 210011})
+({cpu: 66580455 | mem: 213976})
+({cpu: 85806929 | mem: 265772})
+({cpu: 28895149 | mem: 108676})
+({cpu: 937780827 | mem: 624503})
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Long.golden.stat b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Long.golden.stat
@@ -1,15 +1,15 @@
-({cpu: 6396744758 | mem: 6618883})
-({cpu: 4580966 | mem: 21598})
-({cpu: 4577228781 | mem: 4621623})
-({cpu: 4580966 | mem: 21598})
-({cpu: 4577228781 | mem: 4621623})
-({cpu: 4580966 | mem: 21598})
-({cpu: 2757712804 | mem: 2624363})
-({cpu: 4580966 | mem: 21598})
-({cpu: 4577228781 | mem: 4621623})
-({cpu: 4580966 | mem: 21598})
-({cpu: 2757712804 | mem: 2624363})
-({cpu: 4580966 | mem: 21598})
-({cpu: 2757712804 | mem: 2624363})
-({cpu: 4580966 | mem: 21598})
-({cpu: 938196827 | mem: 627103})
+({cpu: 6392104758 | mem: 6589883})
+({cpu: 4548966 | mem: 21398})
+({cpu: 4573996781 | mem: 4601423})
+({cpu: 4548966 | mem: 21398})
+({cpu: 4573996781 | mem: 4601423})
+({cpu: 4548966 | mem: 21398})
+({cpu: 2755888804 | mem: 2612963})
+({cpu: 4548966 | mem: 21398})
+({cpu: 4573996781 | mem: 4601423})
+({cpu: 4548966 | mem: 21398})
+({cpu: 2755888804 | mem: 2612963})
+({cpu: 4548966 | mem: 21398})
+({cpu: 2755888804 | mem: 2612963})
+({cpu: 4548966 | mem: 21398})
+({cpu: 937780827 | mem: 624503})
diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Short.golden.stat b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Short.golden.stat
@@ -1,21 +1,21 @@
 ({cpu: 1360100 | mem: 8600})
 ({cpu: 1912723 | mem: 11932})
-({cpu: 4411889 | mem: 20965})
-({cpu: 4996966 | mem: 24198})
-({cpu: 6692253 | mem: 28231})
-({cpu: 7413953 | mem: 32196})
-({cpu: 12215359 | mem: 47862})
-({cpu: 11497772 | mem: 49394})
-({cpu: 15267148 | mem: 60227})
-({cpu: 9135449 | mem: 35297})
-({cpu: 23261571 | mem: 87124})
-({cpu: 7052283 | mem: 28864})
-({cpu: 33536358 | mem: 121287})
-({cpu: 36443622 | mem: 134613})
-({cpu: 48573898 | mem: 162716})
-({cpu: 51481162 | mem: 176042})
-({cpu: 66082755 | mem: 211411})
-({cpu: 66804455 | mem: 215376})
-({cpu: 86062929 | mem: 267372})
-({cpu: 28991149 | mem: 109276})
-({cpu: 938196827 | mem: 627103})
+({cpu: 4379889 | mem: 20765})
+({cpu: 4964966 | mem: 23998})
+({cpu: 6660253 | mem: 28031})
+({cpu: 7381953 | mem: 31996})
+({cpu: 12151359 | mem: 47462})
+({cpu: 11433772 | mem: 48994})
+({cpu: 15171148 | mem: 59627})
+({cpu: 9103449 | mem: 35097})
+({cpu: 23133571 | mem: 86324})
+({cpu: 7020283 | mem: 28664})
+({cpu: 33376358 | mem: 120287})
+({cpu: 36315622 | mem: 133813})
+({cpu: 48381898 | mem: 161516})
+({cpu: 51321162 | mem: 175042})
+({cpu: 65858755 | mem: 210011})
+({cpu: 66580455 | mem: 213976})
+({cpu: 85806929 | mem: 265772})
+({cpu: 28895149 | mem: 108676})
+({cpu: 937780827 | mem: 624503})
diff --git a/plutus-tx-plugin/test/Plugin/Data/9.12/recursive/sameEmptyRose.golden.uplc b/plutus-tx-plugin/test/Plugin/Data/9.12/recursive/sameEmptyRose.golden.uplc
@@ -70,42 +70,44 @@ program
                                                           go
                                                           g
                                                           f ->
-                                                           choose
-                                                             (\arg ->
-                                                                delay
-                                                                  (\x ->
-                                                                     (\x ->
-                                                                        force
-                                                                          g
+                                                           case
+                                                             (constr 0
+                                                                [ (\arg ->
+                                                                     delay
+                                                                       (\x ->
+                                                                          (\x ->
+                                                                             force
+                                                                               g
+                                                                               (force
+                                                                                  (f
+                                                                                     (delay
+                                                                                        (\x ->
+                                                                                           x)))
+                                                                                  x))
+                                                                            x))
+                                                                , (\arg ->
+                                                                     delay
+                                                                       (force
+                                                                          map
                                                                           (force
-                                                                             (f
+                                                                             (go
                                                                                 (delay
                                                                                    (\x ->
-                                                                                      x)))
-                                                                             x))
-                                                                       x))
-                                                             (\arg ->
-                                                                delay
-                                                                  (force
-                                                                     map
-                                                                     (force
-                                                                        (go
-                                                                           (delay
-                                                                              (\x ->
-                                                                                 x))))))
-                                                             (\arg ->
-                                                                delay
-                                                                  (\x ->
-                                                                     (\x ->
-                                                                        force
-                                                                          (g
-                                                                             (delay
-                                                                                (\x ->
-                                                                                   x)))
-                                                                          (force
-                                                                             f
-                                                                             x))
-                                                                       x))))))
+                                                                                      x))))))
+                                                                , (\arg ->
+                                                                     delay
+                                                                       (\x ->
+                                                                          (\x ->
+                                                                             force
+                                                                               (g
+                                                                                  (delay
+                                                                                     (\x ->
+                                                                                        x)))
+                                                                               (force
+                                                                                  f
+                                                                                  x))
+                                                                            x)) ])
+                                                             [choose]))))
                                                (map (delay (\x -> x))))
                                             (force tup (\arg_0 -> arg_0)))
                                          (delay
diff --git a/plutus-tx-plugin/test/Plugin/Data/9.6/recursive/sameEmptyRose.golden.uplc b/plutus-tx-plugin/test/Plugin/Data/9.6/recursive/sameEmptyRose.golden.uplc
