Skip to content

Commit e0db646

Browse files
author
Brian Huffman
committed
Update submodule versions, adapt to changes in what4 string API.
1 parent 3786115 commit e0db646

File tree

9 files changed

+11
-10
lines changed

9 files changed

+11
-10
lines changed

deps/crucible

Submodule crucible updated 80 files

src/SAWScript/Crucible/JVM/Builtins.hs

+3-2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ import qualified What4.Partial as W4
7373
import qualified What4.ProgramLoc as W4
7474
import qualified What4.Interface as W4
7575
import qualified What4.Expr.Builder as W4
76+
import qualified What4.Utils.StringLiteral as W4S
7677

7778
-- jvm-parser
7879
import qualified Language.JVM.Parser as J
@@ -740,7 +741,7 @@ setupDynamicClassTable sym jc = foldM addClass Map.empty (Map.assocs (CJ.classTa
740741
setupClass :: J.Class -> IO (Crucible.RegValue Sym CJ.JVMClassType)
741742
setupClass cls =
742743
do let cname = J.className cls
743-
name <- W4.stringLit sym (CJ.classNameText (J.className cls))
744+
name <- W4.stringLit sym (W4S.UnicodeLiteral $ CJ.classNameText (J.className cls))
744745
status <- W4.bvLit sym knownRepr 0
745746
super <-
746747
case J.superClass cls of
@@ -750,7 +751,7 @@ setupDynamicClassTable sym jc = foldM addClass Map.empty (Map.assocs (CJ.classTa
750751
Nothing -> return W4.Unassigned -- this should never happen
751752
Just cls' -> W4.justPartExpr sym <$> setupClass cls'
752753
let methods = foldr (addMethod cname) Map.empty (J.classMethods cls)
753-
interfaces <- V.fromList <$> traverse (W4.stringLit sym . CJ.classNameText) (J.classInterfaces cls)
754+
interfaces <- V.fromList <$> traverse (W4.stringLit sym . W4S.UnicodeLiteral . CJ.classNameText) (J.classInterfaces cls)
754755
return $
755756
Crucible.RolledType $
756757
Ctx.Empty

0 commit comments

Comments
 (0)