Merge pull request #1774 from GaloisInc/T1773-fix-TNominal-freeVars

Fix `freeVars` calculation for `TNominal`
GaloisInc · Nov 21, 2024 · 56a93da · 56a93da
2 parents 8ba9700 + 406f2c3
commit 56a93da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,10 @@
 * Fix a bug in which splitting a `[0]` value into type `[inf][0]` would panic.
   ([#1749](https://github.com/GaloisInc/cryptol/issues/1749))
 
+* Fix a bug in which the free variables of types mentioning newtypes or enums
+  were incorrectly computed.
+  ([#1773](https://github.com/GaloisInc/cryptol/issues/1773))
+
 ## New features
 
 * REPL command `:dumptests <FILE> <EXPR>` updated to write to stdout when

diff --git a/src/Cryptol/IR/FreeVars.hs b/src/Cryptol/IR/FreeVars.hs
@@ -159,7 +159,8 @@ instance FreeVars Type where
 
       TUser _ _ t -> freeVars t
       TRec fs     -> freeVars (recordElements fs)
-      TNominal nt ts -> freeVars nt <> freeVars ts
+      TNominal nt ts -> mempty { tyDeps = Set.singleton (ntName nt) }
+                        <> freeVars ts
 
 instance FreeVars TVar where
   freeVars tv = case tv of