crucible-llvm: Make LLVM AST type in load handle operation optional

This is in advance of adding syntax for this operation to crucible-llvm-syntax,
which shouldn't need to use llvm-pretty's AST. This type is only ever used in
diagnostics anyway.

crucible-llvm/src/Lang/Crucible/LLVM/Errors/MemoryError.hs

@@ -58,7 +58,7 @@ data MemoryOp sym w
  (Maybe String, LLVMPtr sym w) -- src
  (SymBV sym wlen) -- length
  (Mem sym)
- | MemLoadHandleOp L.Type (Maybe String) (LLVMPtr sym w) (Mem sym)
+ | MemLoadHandleOp (Maybe L.Type) (Maybe String) (LLVMPtr sym w) (Mem sym)
  | forall wlen. (1 <= wlen) => MemInvalidateOp
  Text (Maybe String) (LLVMPtr sym w) (SymBV sym wlen) (Mem sym)
 
@@ -157,7 +157,11 @@ ppMemoryOp (MemCopyOp (gsym_dest, dest) (gsym_src, src) len mem) =
  ]
 
 ppMemoryOp (MemLoadHandleOp sig gsym ptr mem) =
- vsep [ "Attempting to load callable function with type:" <+> viaShow (L.ppType sig)
+ vsep [ case sig of
+ Just s ->
+ hsep ["Attempting to load callable function with type:", viaShow (L.ppType s)]
+ Nothing ->
+ hsep ["Attempting to load callable function:"]
  , indent 2 (hsep ([ "Via pointer:" ] ++ ppGSym gsym ++ [ ppPtr ptr ]))
  , "In memory state:"
  , indent 2 (ppMem mem)

crucible-llvm/src/Lang/Crucible/LLVM/Extension/Syntax.hs

@@ -171,7 +171,7 @@ data LLVMStmt (f :: CrucibleType -> Type) :: CrucibleType -> Type where
  LLVM_LoadHandle ::
  HasPtrWidth wptr =>
  !(GlobalVar Mem) {- Memory global variable -} ->
- !L.Type  {- expected LLVM type of the function -} ->
+ !(Maybe L.Type) {- expected LLVM type of the function (used only for pretty-printing) -} ->
  !(f (LLVMPointerType wptr)) {- Pointer to load from -} ->
  !(CtxRepr args) {- Expected argument types of the function -} ->
  !(TypeRepr ret) {- Expected return type of the function -} ->

crucible-llvm/src/Lang/Crucible/LLVM/Translation/Instruction.hs

@@ -1877,7 +1877,7 @@ callOrdinaryFunction instr _tailCall fnTy@(L.FunTy lretTy _largTys _varargs) fn
  case asScalar fn' of
  Scalar _ PtrRepr ptr -> do
  memVar <- getMemVar
- v <- extensionStmt (LLVM_LoadHandle memVar fnTy ptr argTypes retTy)
+ v <- extensionStmt (LLVM_LoadHandle memVar (Just fnTy) ptr argTypes retTy)
  ret <- call v args''
  assign_f (BaseExpr retTy ret)
  _ -> fail $ unwords ["unsupported function value", show fn]