From 8d0f08df6ac34b87d75203b4e62aa719b5dc095a Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Thu, 21 Nov 2024 11:22:43 -0800 Subject: [PATCH] Back out "Remove ANF.inline" This backs out commit a8e18d897bc7d557e70a00f3123e34b4686e6bdb. --- unison-runtime/src/Unison/Runtime/Machine.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/unison-runtime/src/Unison/Runtime/Machine.hs b/unison-runtime/src/Unison/Runtime/Machine.hs index 1bb2a8d36c..ce0fd370e7 100644 --- a/unison-runtime/src/Unison/Runtime/Machine.hs +++ b/unison-runtime/src/Unison/Runtime/Machine.hs @@ -2213,10 +2213,11 @@ cacheAdd0 ntys0 termSuperGroups sands cc = do rtm <- updateMap (M.fromList $ zip rs [ntm ..]) (refTm cc) -- check for missing references let arities = fmap (head . ANF.arities) int <> builtinArities + inlinfo = ANF.buildInlineMap int <> builtinInlineInfo rns = RN (refLookup "ty" rty) (refLookup "tm" rtm) (flip M.lookup arities) combinate :: Word64 -> (Reference, SuperGroup Symbol) -> (Word64, EnumMap Word64 Comb) combinate n (r, g) = - (n, emitCombs rns r n g) + (n, emitCombs rns r n $ ANF.inline inlinfo g) let combRefUpdates = (mapFromList $ zip [ntm ..] rs) let combIdFromRefMap = (M.fromList $ zip rs [ntm ..]) let newCacheableCombs =