Better formatting for some location values

Author: robdockins

src/SAWScript/Crucible/LLVM/Builtins.hs

@@ -641,7 +641,7 @@ verifyObligations cc mspec tactic assumes asserts =
                           { goalNum  = n
                           , goalType = "vc"
                           , goalName = nm
-                          , goalLoc  = show ploc
+                          , goalLoc  = show (W4.plSourceLoc ploc) ++ " in " ++ show (W4.plFunction ploc)
                           , goalDesc = msg
                           , goalProp = goal'
                           }
@@ -811,6 +811,7 @@ assumptionsContainContradiction cc methodSpec tactic assumptions =
      let sym = cc^.ccSym
      st <- io $ Common.sawCoreState sym
      let sc  = saw_ctx st
+     let ploc = methodSpec^.MS.csLoc
      pgl <- io $
       do
          -- conjunction of all assumptions
@@ -822,7 +823,7 @@ assumptionsContainContradiction cc methodSpec tactic assumptions =
                   { goalNum  = 0
                   , goalType = "vacuousness check"
                   , goalName = show (methodSpec^.MS.csMethod)
-                  , goalLoc  = show (methodSpec^.MS.csLoc)
+                  , goalLoc  = show (W4.plSourceLoc ploc) ++ " in " ++ show (W4.plFunction ploc)
                   , goalDesc = "vacuousness check"
                   , goalProp = goal'
                   }

src/SAWScript/Crucible/LLVM/Override.hs

@@ -1374,12 +1374,12 @@ matchTerm sc cc loc prepost real expect =
        _ ->
          do t <- liftIO $ scEq sc real expect
             let msg = unlines $
-                  [ "Literal equality " ++ stateCond prepost ++ " at " ++ show loc
+                  [ "Literal equality " ++ stateCond prepost
 --                  , "Expected term: " ++ prettyTerm expect
 --                  , "Actual term:   " ++ prettyTerm real
                   ]
             addTermEq t $ Crucible.SimError loc $ Crucible.AssertFailureSimError msg ""
-  where prettyTerm = show . ppTermDepth 20
+--  where prettyTerm = show . ppTermDepth 20
 
 
 ------------------------------------------------------------------------