Fix build for ghc 9.4.4

These changes make it build once more
llvm-hs · jappeace · Jun 25, 2023 · Jun 25, 2023 · a343598dab021de428723cbb4ec45fc4fc3d80a3
commit a343598dab021de428723cbb4ec45fc4fc3d80a3
diff --git a/llvm-hs-pure/src/LLVM/IRBuilder/Module.hs b/llvm-hs-pure/src/LLVM/IRBuilder/Module.hs
@@ -34,7 +34,8 @@ import Control.Monad.Fail (MonadFail)
 #endif
 
 import Data.Bifunctor
-import Data.ByteString.Short as BS
+import qualified Data.ByteString.Short as BS
+import Data.ByteString.Short(ShortByteString)
 import Data.Char
 import Data.Data
 import Data.Foldable

diff --git a/llvm-hs-pure/src/LLVM/Triple.hs b/llvm-hs-pure/src/LLVM/Triple.hs
@@ -14,7 +14,7 @@ import Control.Monad.Trans.Except
 import Data.Attoparsec.ByteString
 import Data.Attoparsec.ByteString.Char8
 import Data.ByteString.Char8 as ByteString hiding (map, foldr)
-import Data.ByteString.Short hiding (pack)
+import Data.ByteString.Short hiding (pack, foldr)
 
 import Data.Map (Map, (!))
 import qualified Data.Map as Map

diff --git a/llvm-hs/Setup.hs b/llvm-hs/Setup.hs
@@ -169,7 +169,7 @@ main = do
 #else
           newHsc buildInfo localBuildInfo =
 #endif
-              PreProcessor {
+              ppUnlit {
                   platformIndependent = platformIndependent (origHsc buildInfo),
                   runPreProcessor = \inFiles outFiles verbosity -> do
                       llvmConfig <- getLLVMConfig (configFlags localBuildInfo)

diff --git a/llvm-hs/src/LLVM/Internal/Operand.hs b/llvm-hs/src/LLVM/Internal/Operand.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE
   DuplicateRecordFields,
+  DisambiguateRecordFields,
   MultiParamTypeClasses,
   NamedFieldPuns,
   OverloadedStrings,
@@ -835,10 +836,18 @@ instance EncodeM EncodeAST A.DILocalVariable (Ptr FFI.DILocalVariable) where
     Context c <- gets encodeStateContext
     FFI.upCast <$> liftIO (FFI.getDILocalVariable c scope name file line type' arg flags alignInBits)
 
+getDITemplateParameterName :: A.DITemplateParameter -> ShortByteString
+getDITemplateParameterName A.DITemplateTypeParameter {..} = name
+getDITemplateParameterName A.DITemplateValueParameter{..} = name
+
+getDITemplateParameterType :: A.DITemplateParameter -> Maybe (A.MDRef A.DIType)
+getDITemplateParameterType A.DITemplateTypeParameter {..} = type'
+getDITemplateParameterType A.DITemplateValueParameter{..} = type'
+
 instance EncodeM EncodeAST A.DITemplateParameter (Ptr FFI.DITemplateParameter) where
   encodeM p = do
-    name' <- encodeM (A.name (p :: A.DITemplateParameter)) :: EncodeAST (Ptr FFI.MDString)
-    ty <- encodeM (A.type' (p :: A.DITemplateParameter))
+    name' <- encodeM (getDITemplateParameterName p) :: EncodeAST (Ptr FFI.MDString)
+    ty <- encodeM (getDITemplateParameterType p)
     Context c <- gets encodeStateContext
     case p of
       A.DITemplateTypeParameter {} ->