Reimplement refreshTerms to register names in the naming environment.

Brian Huffman · Brian Huffman · commit c085c1830bdc · 2021-05-03T16:42:47.000-07:00
Fixes #869.
diff --git a/src/SAWScript/Crucible/JVM/Override.hs b/src/SAWScript/Crucible/JVM/Override.hs
@@ -381,8 +381,8 @@ refreshTerms sc ss =
      OM (termSub %= Map.union extension)
   where
     freshenTerm (TypedExtCns _cty ec) =
-      do new <- liftIO $ do i <- scFreshGlobalVar sc
-                            scExtCns sc (EC i (ecName ec) (ecType ec))
+      do ec' <- liftIO $ scFreshEC sc (toShortName (ecName ec)) (ecType ec)
+         new <- liftIO $ scExtCns sc ec'
          return (ecVarIndex ec, new)
 
 ------------------------------------------------------------------------
diff --git a/src/SAWScript/Crucible/LLVM/Override.hs b/src/SAWScript/Crucible/LLVM/Override.hs
@@ -709,8 +709,8 @@ refreshTerms sc ss =
      OM (termSub %= Map.union extension)
   where
     freshenTerm (TypedExtCns _cty ec) =
-      do new <- liftIO $ do i <- scFreshGlobalVar sc
-                            scExtCns sc (EC i (ecName ec) (ecType ec))
+      do ec' <- liftIO $ scFreshEC sc (toShortName (ecName ec)) (ecType ec)
+         new <- liftIO $ scExtCns sc ec'
          return (ecVarIndex ec, new)
 
 ------------------------------------------------------------------------
