summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÖmer Sinan Ağacan <omeragacan@gmail.com>2020-04-26 11:05:10 +0300
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-04-26 13:55:22 -0400
commit22bf5c738e0339fa12940414d6448896c6733808 (patch)
tree3f8d0e2aa4a38d853f38fcc7068b4362c7e1d6b1
parentcd4434c8e77213bf3e6f83227fd8802c9f2a6fe2 (diff)
downloadhaskell-22bf5c738e0339fa12940414d6448896c6733808.tar.gz
Tweak includes in non-moving GC headers
We don't use hash tables in non-moving GC so remove the includes. This breaks Compact.c as existing includes no longer include Hash.h, so include Hash.h explicitly in Compact.c.
-rw-r--r--rts/sm/Compact.c1
-rw-r--r--rts/sm/NonMovingMark.h3
-rw-r--r--rts/sm/NonMovingSweep.h1
3 files changed, 1 insertions, 4 deletions
diff --git a/rts/sm/Compact.c b/rts/sm/Compact.c
index d8b21b83c6..5031c535a1 100644
--- a/rts/sm/Compact.c
+++ b/rts/sm/Compact.c
@@ -27,6 +27,7 @@
#include "MarkWeak.h"
#include "StablePtr.h"
#include "StableName.h"
+#include "Hash.h"
// Turn off inlining when debugging - it obfuscates things
#if defined(DEBUG)
diff --git a/rts/sm/NonMovingMark.h b/rts/sm/NonMovingMark.h
index 1e3fb01bd2..0938e2775a 100644
--- a/rts/sm/NonMovingMark.h
+++ b/rts/sm/NonMovingMark.h
@@ -8,14 +8,11 @@
#pragma once
-#include "Hash.h"
#include "Task.h"
#include "NonMoving.h"
#include "BeginPrivate.h"
-#include "Hash.h"
-
enum EntryType {
NULL_ENTRY = 0,
MARK_CLOSURE = 1,
diff --git a/rts/sm/NonMovingSweep.h b/rts/sm/NonMovingSweep.h
index 24e9eccd5e..7a283527bd 100644
--- a/rts/sm/NonMovingSweep.h
+++ b/rts/sm/NonMovingSweep.h
@@ -9,7 +9,6 @@
#pragma once
#include "NonMoving.h"
-#include "Hash.h"
GNUC_ATTR_HOT void nonmovingSweep(void);