Support ghc 9.8.2

well-typed · Apr 27, 2024 · eb6cd44 · eb6cd44
1 parent c2ea390
commit eb6cd44
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ package *
     -fplugin-trustworthy
     -plugin-package=trace-foreign-calls
     -fplugin=Plugin.TraceForeignCalls
-```
+``` 
 
 The first open ensures that if we have dependencies that rely on Safe Haskell,
 compiling modules with the plugin does not mark them as unsafe, the second line

diff --git a/cabal.project.plugin → cabal.project.plugin-9.6.4 b/cabal.project.plugin → cabal.project.plugin-9.6.4
diff --git a/cabal.project.plugin-9.8.2 b/cabal.project.plugin-9.8.2
@@ -0,0 +1,10 @@
+import: cabal.project
+
+package *
+  ghc-options:
+    -package-db=/tmp/cabal-plugin-store/ghc-9.8.2/package.db
+    -fplugin-trustworthy
+    -plugin-package=trace-foreign-calls
+    -fplugin=Plugin.TraceForeignCalls
+
+store-dir: /tmp/cabal-plugin-store
diff --git a/example-pkg-A/example-pkg-A.cabal b/example-pkg-A/example-pkg-A.cabal
@@ -13,12 +13,13 @@ build-type:         Simple
 extra-source-files: cbits/cbits.h
                     cbits/cbits.c
 tested-with:        GHC ==9.6.4
+                    GHC ==9.8.2
 
 common lang
   ghc-options:
       -Wall
   build-depends:
-      base >= 4.18 && < 4.19
+      base >= 4.18 && < 4.20
   default-language:
       GHC2021
 

diff --git a/example-pkg-B/example-pkg-B.cabal b/example-pkg-B/example-pkg-B.cabal
@@ -13,12 +13,13 @@ maintainer:         [email protected]
 category:           Development
 build-type:         Simple
 tested-with:        GHC ==9.6.4
+                    GHC ==9.8.2
 
 common lang
   ghc-options:
       -Wall
   build-depends:
-      base >= 4.18 && < 4.19
+      base >= 4.18 && < 4.20
   default-language:
       GHC2021
 

diff --git a/trace-foreign-calls/src/Plugin/TraceForeignCalls.hs b/trace-foreign-calls/src/Plugin/TraceForeignCalls.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP               #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Plugin.TraceForeignCalls (plugin) where
@@ -198,7 +199,12 @@ mkWrapper rfi@ReplacedForeignImport {
                fun_ext     = mkNameSet [unLoc rfiSuffixedName] -- TODO: what is this?
              , fun_id      = rfiOriginalName
              , fun_matches = MG {
+#if __GLASGOW_HASKELL__ == 906
                    mg_ext  = Generated
+#endif
+#if __GLASGOW_HASKELL__ >= 908
+                   mg_ext  = Generated SkipPmc
+#endif
                  , mg_alts = noLocA . map noLocA $ [
                       Match {
                           m_ext   = EpAnnNotUsed

diff --git a/trace-foreign-calls/trace-foreign-calls.cabal b/trace-foreign-calls/trace-foreign-calls.cabal
@@ -18,14 +18,15 @@ extra-doc-files:    CHANGELOG.md
 extra-source-files: test-cbits/test_cbits.h
                     test-cbits/test_cbits.c
 tested-with:        GHC ==9.6.4
+                    GHC ==9.8.2
 
 source-repository head
   type:     git
   location: https://github.com/well-typed/trace-foreign-calls
 
 common lang
   build-depends:
-      base >= 4.18 && < 4.19
+      base >= 4.18 && < 4.20
   default-language:
       GHC2021
   ghc-options:
@@ -49,7 +50,7 @@ library
   build-depends:
       -- dependencies intentionally kept at a minimum
       -- (we want to be able to build the boot libs with this plugin)
-    , ghc >= 9.6 && < 9.7
+    , ghc >= 9.6 && < 9.9
 
 test-suite test-trace-foreign-calls
   import: