summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2016-01-23 13:12:10 +0100
committerBen Gamari <ben@smart-cactus.org>2016-01-23 13:12:10 +0100
commitf42db1574935b088cfc13cca7c935990002651dc (patch)
tree67b2465848dad3a0b76485b42fe8af2b92c04bce /includes
parent4e04043d1bb458439d3c3db3ffa9851bff780083 (diff)
downloadhaskell-f42db1574935b088cfc13cca7c935990002651dc.tar.gz
Remove unused IND_PERM
it seems that this closure type has not been in use since 5d52d9, so all this is dead and untested code. This removes it. Some of the code might be useful for a counting indirection as described in #10613, so when implementing that, have a look at what this commit removes. Test Plan: validate on harbormaster Reviewers: austin, bgamari, simonmar Reviewed By: simonmar Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1821
Diffstat (limited to 'includes')
-rw-r--r--includes/Cmm.h1
-rw-r--r--includes/rts/storage/ClosureMacros.h1
-rw-r--r--includes/rts/storage/ClosureTypes.h73
-rw-r--r--includes/stg/MiscClosures.h1
4 files changed, 36 insertions, 40 deletions
diff --git a/includes/Cmm.h b/includes/Cmm.h
index 20d6e56228..cbd7e36ac1 100644
--- a/includes/Cmm.h
+++ b/includes/Cmm.h
@@ -288,7 +288,6 @@
(TO_W_( %INFO_TYPE(%STD_INFO(info)) )) { \
case \
IND, \
- IND_PERM, \
IND_STATIC: \
{ \
x = StgInd_indirectee(x); \
diff --git a/includes/rts/storage/ClosureMacros.h b/includes/rts/storage/ClosureMacros.h
index a914059a5c..d53487326f 100644
--- a/includes/rts/storage/ClosureMacros.h
+++ b/includes/rts/storage/ClosureMacros.h
@@ -378,7 +378,6 @@ closure_sizeW_ (StgClosure *p, StgInfoTable *info)
case PAP:
return pap_sizeW((StgPAP *)p);
case IND:
- case IND_PERM:
return sizeofW(StgInd);
case ARR_WORDS:
return arr_words_sizeW((StgArrBytes *)p);
diff --git a/includes/rts/storage/ClosureTypes.h b/includes/rts/storage/ClosureTypes.h
index 9bdddc4e0e..4f66de318b 100644
--- a/includes/rts/storage/ClosureTypes.h
+++ b/includes/rts/storage/ClosureTypes.h
@@ -47,42 +47,41 @@
#define PAP 26
#define AP_STACK 27
#define IND 28
-#define IND_PERM 29
-#define IND_STATIC 30
-#define RET_BCO 31
-#define RET_SMALL 32
-#define RET_BIG 33
-#define RET_FUN 34
-#define UPDATE_FRAME 35
-#define CATCH_FRAME 36
-#define UNDERFLOW_FRAME 37
-#define STOP_FRAME 38
-#define BLOCKING_QUEUE 39
-#define BLACKHOLE 40
-#define MVAR_CLEAN 41
-#define MVAR_DIRTY 42
-#define TVAR 43
-#define ARR_WORDS 44
-#define MUT_ARR_PTRS_CLEAN 45
-#define MUT_ARR_PTRS_DIRTY 46
-#define MUT_ARR_PTRS_FROZEN0 47
-#define MUT_ARR_PTRS_FROZEN 48
-#define MUT_VAR_CLEAN 49
-#define MUT_VAR_DIRTY 50
-#define WEAK 51
-#define PRIM 52
-#define MUT_PRIM 53
-#define TSO 54
-#define STACK 55
-#define TREC_CHUNK 56
-#define ATOMICALLY_FRAME 57
-#define CATCH_RETRY_FRAME 58
-#define CATCH_STM_FRAME 59
-#define WHITEHOLE 60
-#define SMALL_MUT_ARR_PTRS_CLEAN 61
-#define SMALL_MUT_ARR_PTRS_DIRTY 62
-#define SMALL_MUT_ARR_PTRS_FROZEN0 63
-#define SMALL_MUT_ARR_PTRS_FROZEN 64
-#define N_CLOSURE_TYPES 65
+#define IND_STATIC 29
+#define RET_BCO 30
+#define RET_SMALL 31
+#define RET_BIG 32
+#define RET_FUN 33
+#define UPDATE_FRAME 34
+#define CATCH_FRAME 35
+#define UNDERFLOW_FRAME 36
+#define STOP_FRAME 37
+#define BLOCKING_QUEUE 38
+#define BLACKHOLE 39
+#define MVAR_CLEAN 40
+#define MVAR_DIRTY 41
+#define TVAR 42
+#define ARR_WORDS 43
+#define MUT_ARR_PTRS_CLEAN 44
+#define MUT_ARR_PTRS_DIRTY 45
+#define MUT_ARR_PTRS_FROZEN0 46
+#define MUT_ARR_PTRS_FROZEN 47
+#define MUT_VAR_CLEAN 48
+#define MUT_VAR_DIRTY 49
+#define WEAK 50
+#define PRIM 51
+#define MUT_PRIM 52
+#define TSO 53
+#define STACK 54
+#define TREC_CHUNK 55
+#define ATOMICALLY_FRAME 56
+#define CATCH_RETRY_FRAME 57
+#define CATCH_STM_FRAME 58
+#define WHITEHOLE 59
+#define SMALL_MUT_ARR_PTRS_CLEAN 60
+#define SMALL_MUT_ARR_PTRS_DIRTY 61
+#define SMALL_MUT_ARR_PTRS_FROZEN0 62
+#define SMALL_MUT_ARR_PTRS_FROZEN 63
+#define N_CLOSURE_TYPES 64
#endif /* RTS_STORAGE_CLOSURETYPES_H */
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h
index 1236d735ff..dff129b948 100644
--- a/includes/stg/MiscClosures.h
+++ b/includes/stg/MiscClosures.h
@@ -86,7 +86,6 @@ RTS_RET(stg_apply_interp);
RTS_ENTRY(stg_IND);
RTS_ENTRY(stg_IND_direct);
RTS_ENTRY(stg_IND_STATIC);
-RTS_ENTRY(stg_IND_PERM);
RTS_ENTRY(stg_BLACKHOLE);
RTS_ENTRY(stg_CAF_BLACKHOLE);
RTS_ENTRY(__stg_EAGER_BLACKHOLE);