diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +## 9.0.0 (2019-09-06) + +* Support GHC 8.8 +* Update to LLVM 9.0 + * Note that this is the last LLVM release that supports the current + OrcJIT APIs and `llvm-hs` does not yet have bindings for OrcJIT + V2. If you are interested in working on that please get in + touch. See https://github.com/llvm-hs/llvm-hs/issues/276 for more + details. + * The `sanitizeAddresses` field from `MachineCodeOptions` has been + removed following a change in LLVM. + * The `MemorySanitizer` now has two new options `kernel` and + `recover` matching the options in LLVM. + + +## 8.1.0 + +* Change `withHostTargetMachine` to accept the code model, relocation model, + and optimization level as arguments. The old behaviour is available + under the name `withHostTargetMachineDefault`. + ## 8.0.0 (2019-03-10) * Upgrade to LLVM 8 diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -41,10 +41,10 @@ #endif llvmVersion :: Version -llvmVersion = mkVersion [8,0] +llvmVersion = mkVersion [9,0] --- Ordered by decreasing specificty so we will prefer llvm-config-8.0 --- over llvm-config-8 over llvm-config. +-- Ordered by decreasing specificty so we will prefer llvm-config-9.0 +-- over llvm-config-9 over llvm-config. llvmConfigNames :: [String] llvmConfigNames = reverse versionedConfigs ++ ["llvm-config"] where diff --git a/llvm-hs.cabal b/llvm-hs.cabal --- a/llvm-hs.cabal +++ b/llvm-hs.cabal @@ -1,5 +1,5 @@ name: llvm-hs -version: 8.0.0 +version: 9.0.0 license: BSD3 license-file: LICENSE author: Anthony Cowley, Stephen Diehl, Moritz Kiefer , Benjamin S. Scarlet @@ -42,13 +42,13 @@ test/debug_metadata_4.ll test/debug_metadata_5.ll test/main_return_38.c -tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.4 +tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5 extra-source-files: CHANGELOG.md source-repository head type: git location: git://github.com/llvm-hs/llvm-hs.git - branch: llvm-8 + branch: llvm-9 flag shared-llvm description: link against llvm shared rather than static library @@ -79,7 +79,7 @@ template-haskell >= 2.5.0.0, containers >= 0.4.2.1, array >= 0.4.0.0, - llvm-hs-pure == 8.0.* + llvm-hs-pure == 9.0.* hs-source-dirs: src default-extensions: NoImplicitPrelude diff --git a/src/Control/Monad/Trans/AnyCont.hs b/src/Control/Monad/Trans/AnyCont.hs --- a/src/Control/Monad/Trans/AnyCont.hs +++ b/src/Control/Monad/Trans/AnyCont.hs @@ -1,5 +1,5 @@ {-# LANGUAGE - RankNTypes + CPP, RankNTypes #-} module Control.Monad.Trans.AnyCont where @@ -21,7 +21,9 @@ instance Monad m => Monad (AnyContT m) where AnyContT f >>= k = AnyContT $ f >>= unAnyContT . k return a = AnyContT $ return a +#if !(MIN_VERSION_base(4,13,0)) fail s = AnyContT (ContT (\_ -> Cont.fail s)) +#endif instance MonadFail m => MonadFail (AnyContT m) where fail s = AnyContT (ContT (\_ -> Fail.fail s)) diff --git a/src/LLVM/CodeModel.hs b/src/LLVM/CodeModel.hs --- a/src/LLVM/CodeModel.hs +++ b/src/LLVM/CodeModel.hs @@ -1,4 +1,4 @@ --- | Relocations, used in specifying TargetMachine +-- | Code model, used in specifying TargetMachine module LLVM.CodeModel where import LLVM.Prelude diff --git a/src/LLVM/Internal/Attribute.hs b/src/LLVM/Internal/Attribute.hs --- a/src/LLVM/Internal/Attribute.hs +++ b/src/LLVM/Internal/Attribute.hs @@ -55,6 +55,7 @@ A.PA.Nest -> FFI.parameterAttributeKindNest A.PA.ReadOnly -> FFI.parameterAttributeKindReadOnly A.PA.ReadNone -> FFI.parameterAttributeKindReadNone + A.PA.ImmArg -> FFI.parameterAttributeKindImmArg A.PA.InAlloca -> FFI.parameterAttributeKindInAlloca A.PA.NonNull -> FFI.parameterAttributeKindNonNull A.PA.Returned -> FFI.parameterAttributeKindReturned @@ -149,6 +150,7 @@ [parameterAttributeKindP|Returned|] -> return A.PA.Returned [parameterAttributeKindP|SwiftSelf|] -> return A.PA.SwiftSelf [parameterAttributeKindP|SwiftError|] -> return A.PA.SwiftError + [parameterAttributeKindP|ImmArg|] -> return A.PA.ImmArg _ -> error $ "unhandled parameter attribute enum value: " ++ show enum instance DecodeM DecodeAST A.FA.FunctionAttribute FFI.FunctionAttribute where diff --git a/src/LLVM/Internal/FFI/Attribute.h b/src/LLVM/Internal/FFI/Attribute.h --- a/src/LLVM/Internal/FFI/Attribute.h +++ b/src/LLVM/Internal/FFI/Attribute.h @@ -16,6 +16,7 @@ macro(Convergent,F,F,T) \ macro(Dereferenceable,T,T,F) \ macro(DereferenceableOrNull,T,T,F) \ + macro(ImmArg,T,F,F) \ macro(InAlloca,T,F,F) \ macro(InReg,T,T,F) \ macro(InaccessibleMemOnly,F,F,T) \ @@ -30,11 +31,13 @@ macro(NoCapture,T,F,F) \ macro(NoCfCheck,F,F,T) \ macro(NoDuplicate,F,F,T) \ + macro(NoFree,F,F,T) \ macro(NoImplicitFloat,F,F,T) \ macro(NoInline,F,F,T) \ macro(NoRecurse,F,F,T) \ macro(NoRedZone,F,F,T) \ macro(NoReturn,F,F,T) \ + macro(NoSync,F,F,T) \ macro(NoUnwind,F,F,T) \ macro(NonLazyBind,F,F,T) \ macro(NonNull,T,T,F) \ @@ -49,6 +52,7 @@ macro(SafeStack,F,F,T) \ macro(SanitizeAddress,F,F,T) \ macro(SanitizeHWAddress,F,F,T) \ + macro(SanitizeMemTag,F,F,T) \ macro(SanitizeMemory,F,F,T) \ macro(SanitizeThread,F,F,T) \ macro(ShadowCallStack,F,F,T) \ @@ -63,6 +67,7 @@ macro(SwiftError,T,F,F) \ macro(SwiftSelf,T,F,F) \ macro(UWTable,F,F,T) \ + macro(WillReturn,F,F,T) \ macro(WriteOnly,T,F,T) \ macro(ZExt,T,T,F) \ macro(EndAttrKinds,F,F,F) diff --git a/src/LLVM/Internal/FFI/MetadataC.cpp b/src/LLVM/Internal/FFI/MetadataC.cpp --- a/src/LLVM/Internal/FFI/MetadataC.cpp +++ b/src/LLVM/Internal/FFI/MetadataC.cpp @@ -340,15 +340,15 @@ return cast_or_null(dt->getRawElements()); } -DITypeRef LLVM_Hs_DICompositeTypeGetVTableHolder(DICompositeType *dt) { +DIType* LLVM_Hs_DICompositeTypeGetVTableHolder(DICompositeType *dt) { return dt->getVTableHolder(); } -DITypeRef LLVM_Hs_DICompositeTypeGetBaseType(DICompositeType *dt) { +DIType* LLVM_Hs_DICompositeTypeGetBaseType(DICompositeType *dt) { return dt->getBaseType(); } -DITypeRef LLVM_Hs_DIDerivedTypeGetBaseType(DIDerivedType *dt) { +DIType* LLVM_Hs_DIDerivedTypeGetBaseType(DIDerivedType *dt) { return dt->getBaseType(); } @@ -507,7 +507,7 @@ } DIType* LLVM_Hs_DISubprogram_GetContainingType(DISubprogram* p) { - return p->getContainingType().resolve(); + return p->getContainingType(); } DICompileUnit* LLVM_Hs_DISubprogram_GetUnit(DISubprogram* p) { @@ -588,7 +588,7 @@ } DIType* LLVM_Hs_DIVariable_GetType(DIVariable* v) { - return v->getType().resolve(); + return v->getType(); } uint32_t LLVM_Hs_DIVariable_GetAlignInBits(DIVariable* v) { @@ -745,7 +745,7 @@ } DIType* LLVM_Hs_DITemplateParameter_GetType(DITemplateParameter* p) { - return p->getType().resolve(); + return p->getType(); } // DITemplateTypeParameter @@ -821,7 +821,7 @@ } DINode* LLVM_Hs_DIImportedEntity_GetEntity(DIImportedEntity* e) { - return e->getEntity().resolve(); + return e->getEntity(); } MDString* LLVM_Hs_DIImportedEntity_GetName(DIImportedEntity* e) { @@ -877,7 +877,7 @@ } DIType* LLVM_Hs_DIObjCProperty_GetType(DIObjCProperty* o) { - return o->getType().resolve(); + return o->getType(); } // DIModule diff --git a/src/LLVM/Internal/FFI/OrcJITC.cpp b/src/LLVM/Internal/FFI/OrcJITC.cpp --- a/src/LLVM/Internal/FFI/OrcJITC.cpp +++ b/src/LLVM/Internal/FFI/OrcJITC.cpp @@ -1,3 +1,7 @@ +// We ignore deprecations until we get around to updating to the new OrcJIT API +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + #include "llvm/Support/Error.h" #include "LLVM/Internal/FFI/ErrorHandling.hpp" diff --git a/src/LLVM/Internal/FFI/PassManagerC.cpp b/src/LLVM/Internal/FFI/PassManagerC.cpp --- a/src/LLVM/Internal/FFI/PassManagerC.cpp +++ b/src/LLVM/Internal/FFI/PassManagerC.cpp @@ -9,6 +9,7 @@ #include "llvm/Transforms/IPO/PassManagerBuilder.h" #include "llvm/Transforms/Vectorize.h" #include "llvm/Transforms/Instrumentation.h" +#include "llvm/Transforms/Instrumentation/AddressSanitizer.h" #include "llvm/Transforms/Instrumentation/BoundsChecking.h" #include "llvm/Transforms/Instrumentation/MemorySanitizer.h" #include "llvm/Transforms/Instrumentation/ThreadSanitizer.h" @@ -146,14 +147,16 @@ void LLVM_Hs_AddAddressSanitizerModulePass( LLVMPassManagerRef PM ) { - unwrap(PM)->add(createAddressSanitizerModulePass()); + unwrap(PM)->add(createModuleAddressSanitizerLegacyPassPass()); } void LLVM_Hs_AddMemorySanitizerPass( LLVMPassManagerRef PM, - LLVMBool trackOrigins + LLVMBool trackOrigins, + LLVMBool recover, + LLVMBool kernel ) { - unwrap(PM)->add(createMemorySanitizerLegacyPassPass(trackOrigins)); + unwrap(PM)->add(createMemorySanitizerLegacyPassPass({trackOrigins, recover, kernel})); } void LLVM_Hs_AddThreadSanitizerPass( diff --git a/src/LLVM/Internal/FFI/ShortByteString.hs b/src/LLVM/Internal/FFI/ShortByteString.hs --- a/src/LLVM/Internal/FFI/ShortByteString.hs +++ b/src/LLVM/Internal/FFI/ShortByteString.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module LLVM.Internal.FFI.ShortByteString ( packCString , packCStringLen @@ -5,8 +6,12 @@ , useAsCStringLen ) where -import LLVM.Prelude + +#if MIN_VERSION_bytestring(0,10,9) +import Data.ByteString.Short +#else +import LLVM.Prelude import Data.ByteString.Internal (c_strlen) import Data.ByteString.Short.Internal import qualified Data.ByteString.Short as ByteString @@ -14,6 +19,7 @@ import Foreign.Marshal.Alloc import Foreign.Storable + {-# INLINABLE packCString #-} packCString :: CString -> IO ShortByteString packCString cstr = do @@ -42,3 +48,4 @@ copyToPtr bs 0 buf (fromIntegral l) action (buf, l) where l = ByteString.length bs +#endif diff --git a/src/LLVM/Internal/FFI/Target.h b/src/LLVM/Internal/FFI/Target.h --- a/src/LLVM/Internal/FFI/Target.h +++ b/src/LLVM/Internal/FFI/Target.h @@ -54,7 +54,6 @@ } LLVM_Hs_TargetOptionFlag; #define LLVM_HS_FOR_EACH_MC_TARGET_OPTION_FLAG(macro) \ - macro(SanitizeAddress) \ macro(MCRelaxAll) \ macro(MCNoExecStack) \ macro(MCFatalWarnings) \ diff --git a/src/LLVM/Internal/Operand.hs b/src/LLVM/Internal/Operand.hs --- a/src/LLVM/Internal/Operand.hs +++ b/src/LLVM/Internal/Operand.hs @@ -78,7 +78,15 @@ A.IntroducedVirtual -> 1 `shiftL` 18 A.BitField -> 1 `shiftL` 19 A.NoReturn -> 1 `shiftL` 20 - A.MainSubprogram -> 1 `shiftL` 21 + A.ArgumentNotModified -> 1 `shiftL` 21 + A.TypePassByValue -> 1 `shiftL` 22 + A.TypePassByReference -> 1 `shiftL` 23 + A.EnumClass -> 1 `shiftL` 24 + A.Thunk -> 1 `shiftL` 25 + A.NonTrivial -> 1 `shiftL` 26 + A.BigEndian -> 1 `shiftL` 27 + A.LittleEndian -> 1 `shiftL` 28 + A.AllCallsDescribed -> 1 `shiftL` 29 instance Applicative m => DecodeM m [A.DIFlag] FFI.DIFlags where decodeM (FFI.DIFlags f) = @@ -119,7 +127,15 @@ , A.IntroducedVirtual , A.BitField , A.NoReturn - , A.MainSubprogram + , A.ArgumentNotModified + , A.TypePassByValue + , A.TypePassByReference + , A.EnumClass + , A.Thunk + , A.NonTrivial + , A.BigEndian + , A.LittleEndian + , A.AllCallsDescribed ] instance DecodeM DecodeAST A.Operand (Ptr FFI.Value) where diff --git a/src/LLVM/Internal/Target.hs b/src/LLVM/Internal/Target.hs --- a/src/LLVM/Internal/Target.hs +++ b/src/LLVM/Internal/Target.hs @@ -11,6 +11,7 @@ import Control.Monad.AnyCont import Control.Monad.Catch +import Control.Monad.Fail (MonadFail) import Control.Monad.IO.Class import Control.Monad.Trans.Except @@ -124,7 +125,7 @@ instance EncodeM e ByteString es => EncodeM e (Map CPUFeature Bool) es where encodeM = encodeM . ByteString.intercalate "," . map (\(CPUFeature f, enabled) -> (if enabled then "+" else "-") <> f) . Map.toList -instance (Monad d, DecodeM d ByteString es) => DecodeM d (Map CPUFeature Bool) es where +instance (MonadFail d, DecodeM d ByteString es) => DecodeM d (Map CPUFeature Bool) es where decodeM es = do s <- decodeM es let flag = do @@ -203,7 +204,6 @@ pokeMachineCodeOptions :: TO.MachineCodeOptions -> MCTargetOptions -> IO () pokeMachineCodeOptions hOpts (MCTargetOptions cOpts) = mapM_ (\(c, ha) -> FFI.setMCTargetOptionFlag cOpts c =<< encodeM (ha hOpts)) [ - (FFI.mcTargetOptionFlagSanitizeAddress, TO.sanitizeAddresses), (FFI.mcTargetOptionFlagMCRelaxAll, TO.relaxAll), (FFI.mcTargetOptionFlagMCNoExecStack, TO.noExecutableStack), (FFI.mcTargetOptionFlagMCFatalWarnings, TO.fatalWarnings), @@ -279,8 +279,6 @@ peekMachineCodeOptions :: MCTargetOptions -> IO TO.MachineCodeOptions peekMachineCodeOptions (MCTargetOptions tOpts) = do let gof = decodeM <=< FFI.getMCTargetOptionsFlag tOpts - sanitizeAddresses - <- gof FFI.mcTargetOptionFlagSanitizeAddress relaxAll <- gof FFI.mcTargetOptionFlagMCRelaxAll noExecutableStack @@ -406,16 +404,37 @@ initializeAllTargets :: IO () initializeAllTargets = FFI.initializeAllTargets --- | Bracket creation and destruction of a 'TargetMachine' configured for the host -withHostTargetMachine :: (TargetMachine -> IO a) -> IO a -withHostTargetMachine f = do +-- | Bracket creation and destruction of a 'TargetMachine' configured for the host. +-- +-- This function infers and fills the properties of the host machine +-- (architecture, CPU type, operating system etc.) to construct +-- a 'TargetMachine' value, but other parameters of 'TargetMachine' (the +-- code model, relocation model, and optimization level) have to be +-- provided by the user. For instance, for the JIT-compiled code that you +-- want to dynamically load you probably want to use the 'Reloc.PIC' +-- relocation model. +withHostTargetMachine + :: Reloc.Model + -> CodeModel.Model + -> CodeGenOpt.Level + -> (TargetMachine -> IO a) -> IO a +withHostTargetMachine relocModel codeModel codeGenOpt f = do initializeAllTargets triple <- getProcessTargetTriple cpu <- getHostCPUName features <- getHostCPUFeatures (target, _) <- lookupTarget Nothing triple withTargetOptions $ \options -> - withTargetMachine target triple cpu features options Reloc.Default CodeModel.Default CodeGenOpt.Default f + withTargetMachine target triple cpu features options relocModel codeModel codeGenOpt f + +-- | Like 'withHostTargetMachine', but assumes the default values for the +-- relocation model, code model, and optimization level ('Reloc.Default', +-- 'CodeModel.Default', 'CodeGenOpt.Default' respectively). +-- +-- Note that the 'Reloc.Default' relocation model __is not__ suitable for +-- JIT compilation; use 'withHostTargetMachine' and 'Reloc.PIC' instead. +withHostTargetMachineDefault :: (TargetMachine -> IO a) -> IO a +withHostTargetMachineDefault f = withHostTargetMachine Reloc.Default CodeModel.Default CodeGenOpt.Default f -- | newtype TargetLibraryInfo = TargetLibraryInfo (Ptr FFI.TargetLibraryInfo) diff --git a/src/LLVM/Target.hs b/src/LLVM/Target.hs --- a/src/LLVM/Target.hs +++ b/src/LLVM/Target.hs @@ -7,7 +7,7 @@ Target, TargetMachine, TargetLowering, CPUFeature(..), withTargetOptions, peekTargetOptions, pokeTargetOptions, - withTargetMachine, withHostTargetMachine, targetMachineOptions, + withTargetMachine, withHostTargetMachine, withHostTargetMachineDefault, targetMachineOptions, getTargetLowering, getTargetMachineTriple, getDefaultTargetTriple, getProcessTargetTriple, getHostCPUName, getHostCPUFeatures, getTargetMachineDataLayout, initializeNativeTarget, initializeAllTargets, diff --git a/src/LLVM/Target/Options.hs b/src/LLVM/Target/Options.hs --- a/src/LLVM/Target/Options.hs +++ b/src/LLVM/Target/Options.hs @@ -101,7 +101,6 @@ -- | data MachineCodeOptions = MachineCodeOptions { - sanitizeAddresses :: Bool, relaxAll :: Bool, noExecutableStack :: Bool, fatalWarnings :: Bool, diff --git a/src/LLVM/Transforms.hs b/src/LLVM/Transforms.hs --- a/src/LLVM/Transforms.hs +++ b/src/LLVM/Transforms.hs @@ -97,7 +97,9 @@ | AddressSanitizer | AddressSanitizerModule | MemorySanitizer { - trackOrigins :: Bool + trackOrigins :: Bool, + recover :: Bool, + kernel :: Bool } | ThreadSanitizer | BoundsChecking @@ -136,7 +138,9 @@ -- | Defaults for 'MemorySanitizer'. defaultMemorySanitizer :: Pass defaultMemorySanitizer = MemorySanitizer { - trackOrigins = False + trackOrigins = False, + recover = False, + kernel = False } -- | Defaults for 'ThreadSanitizer'. diff --git a/test/LLVM/Test/Instructions.hs b/test/LLVM/Test/Instructions.hs --- a/test/LLVM/Test/Instructions.hs +++ b/test/LLVM/Test/Instructions.hs @@ -737,7 +737,6 @@ \source_filename = \"\"\n\ \\n\ \define void @0() {\n\ - \;