Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
head.hackage
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
head.hackage
Merge requests
!249
Draft: Migrate ghc-debug-common patch, bump ghc-debug submodule
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
Draft: Migrate ghc-debug-common patch, bump ghc-debug submodule
ghc-debug-submodule-bump
into
master
Overview
0
Commits
1
Pipelines
2
Changes
2
Closed
Ryan Scott
requested to merge
ghc-debug-submodule-bump
into
master
2 years ago
Overview
0
Commits
1
Pipelines
2
Changes
2
Expand
Include workarounds for
ghc-debug#10
and
ghc-debug#12
.
Edited
2 years ago
by
Ryan Scott
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
4d0c3d11
1 commit,
2 years ago
2 files
+
26
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
patches/ghc-debug-common-0.
2.1
.0.patch
→
patches/ghc-debug-common-0.
3.0
.0.patch
+
25
−
0
Options
diff --git a/src/GHC/Debug/Decode/Convert.hs b/src/GHC/Debug/Decode/Convert.hs
index
5df6523..e6048b6
100644
index
3aca42b..63dfe6a
100644
--- a/src/GHC/Debug/Decode/Convert.hs
+++ b/src/GHC/Debug/Decode/Convert.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{- Convert a GenClosure to a DebugClosure -}
module GHC.Debug.Decode.Convert where
@@ -27,7 +28,11 @@
convertClosure itb g =
GHC.MVarClosure _ a2 a3 a4 -> MVarClosure itb a2 a3 a4
@@ -29,7 +29,11 @@
convertClosure itb g =
GHC.MutVarClosure _ a2 -> MutVarClosure itb a2
GHC.BlockingQueueClosure _ a2 a3 a4 a5 -> BlockingQueueClosure itb a2 a3 a4 a5
- GHC.TSOClosure _ a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 -> TSOClosure itb a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16
+ GHC.TSOClosure _ a2 a3 a4 a5 a6 a7
-- GHC.TSOClosure _ a2 a3 a4 a5 a6 a7 _ a8 a9 a10 a11 a12 a13 a14 a15 a16 -> TSOClosure itb a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16
+#if __GLASGOW_HASKELL__ >= 905
+ _
+ GHC.TSOClosure _ a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 -> TSOClosure itb a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17
+#else
GHC.TSOClosure _ a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 -> TSOClosure itb a2 a3 a4 a5 a6 a7 Nothing a8 a9 a10 a11 a12 a13 a14 a15 a16
+#endif
+ a8 a9 a10 a11 a12 a13 a14 a15 a16 -> TSOClosure itb a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16
-- GHC.StackClosure _ a2 a3 a4 a5 -> StackClosure itb a2 a3 a4 (a2, (StackPtr a5))
{-
GHC.IntClosure a1 a2 -> IntClosure a1 a2
@@ -4
0,10 +45,14
@@
convertClosure itb g =
@@ -4
2,7 +46,7
@@
convertClosure itb g =
-}
GHC.OtherClosure _ a2 a3 -> OtherClosure itb a2 a3
GHC.WeakClosure _ a2 a3 a4 a5 a6 ->
-#if __GLASGOW_HASKELL__ >= 905
+#if __GLASGOW_HASKELL__ >= 904
+
let w_link = a6
+
#else
let w_link = a6
#else
-- nullPtr check
let w_link = if a6 == 0
then Nothing
else Just a6
+#endif
in WeakClosure itb a2 a3 a4 a5 w_link
GHC.UnsupportedClosure _ -> UnsupportedClosure itb
c -> error ("Unexpected closure type: " ++ show c)
Loading