-#define CONSTR_INTLIKE 7
-#define CONSTR_CHARLIKE 8
-#define CONSTR_STATIC 9
-#define CONSTR_NOCAF_STATIC 10
-#define FUN 11
-#define FUN_1_0 12
-#define FUN_0_1 13
-#define FUN_2_0 14
-#define FUN_1_1 15
-#define FUN_0_2 16
-#define FUN_STATIC 17
-#define THUNK 18
-#define THUNK_1_0 19
-#define THUNK_0_1 20
-#define THUNK_2_0 21
-#define THUNK_1_1 22
-#define THUNK_0_2 23
-#define THUNK_STATIC 24
-#define THUNK_SELECTOR 25
-#define BCO 26
-#define AP 27
-#define PAP 28
-#define AP_STACK 29
-#define IND 30
-#define IND_OLDGEN 31
-#define IND_PERM 32
-#define IND_OLDGEN_PERM 33
-#define IND_STATIC 34
-#define RET_BCO 35
-#define RET_SMALL 36
-#define RET_VEC_SMALL 37
-#define RET_BIG 38
-#define RET_VEC_BIG 39
-#define RET_DYN 40
-#define RET_FUN 41
-#define UPDATE_FRAME 42
-#define CATCH_FRAME 43
-#define STOP_FRAME 44
-#define CAF_BLACKHOLE 45
-#define BLACKHOLE 46
-#define SE_BLACKHOLE 47
-#define SE_CAF_BLACKHOLE 48
-#define MVAR 49
-#define ARR_WORDS 50
-#define MUT_ARR_PTRS_CLEAN 51
-#define MUT_ARR_PTRS_DIRTY 52
-#define MUT_ARR_PTRS_FROZEN0 53
-#define MUT_ARR_PTRS_FROZEN 54
-#define MUT_VAR_CLEAN 55
-#define MUT_VAR_DIRTY 56
-#define WEAK 57
-#define STABLE_NAME 58
-#define TSO 59
-#define BLOCKED_FETCH 60
-#define FETCH_ME 61
-#define FETCH_ME_BQ 62
-#define RBH 63
-#define EVACUATED 64
-#define REMOTE_REF 65
-#define TVAR_WAIT_QUEUE 66
-#define TVAR 67
-#define TREC_CHUNK 68
-#define TREC_HEADER 69
-#define ATOMICALLY_FRAME 70
-#define CATCH_RETRY_FRAME 71
-#define CATCH_STM_FRAME 72
-#define N_CLOSURE_TYPES 73
+#define CONSTR_STATIC 7
+#define CONSTR_NOCAF_STATIC 8
+#define FUN 9
+#define FUN_1_0 10
+#define FUN_0_1 11
+#define FUN_2_0 12
+#define FUN_1_1 13
+#define FUN_0_2 14
+#define FUN_STATIC 15
+#define THUNK 16
+#define THUNK_1_0 17
+#define THUNK_0_1 18
+#define THUNK_2_0 19
+#define THUNK_1_1 20
+#define THUNK_0_2 21
+#define THUNK_STATIC 22
+#define THUNK_SELECTOR 23
+#define BCO 24
+#define AP 25
+#define PAP 26
+#define AP_STACK 27
+#define IND 28
+#define IND_OLDGEN 29
+#define IND_PERM 30
+#define IND_OLDGEN_PERM 31
+#define IND_STATIC 32
+#define RET_BCO 33
+#define RET_SMALL 34
+#define RET_BIG 35
+#define RET_DYN 36
+#define RET_FUN 37
+#define UPDATE_FRAME 38
+#define CATCH_FRAME 39
+#define STOP_FRAME 40
+#define CAF_BLACKHOLE 41
+#define BLACKHOLE 42
+#define MVAR_CLEAN 43
+#define MVAR_DIRTY 44
+#define ARR_WORDS 45
+#define MUT_ARR_PTRS_CLEAN 46
+#define MUT_ARR_PTRS_DIRTY 47
+#define MUT_ARR_PTRS_FROZEN0 48
+#define MUT_ARR_PTRS_FROZEN 49
+#define MUT_VAR_CLEAN 50
+#define MUT_VAR_DIRTY 51
+#define WEAK 52
+#define STABLE_NAME 53
+#define TSO 54
+#define BLOCKED_FETCH 55
+#define FETCH_ME 56
+#define FETCH_ME_BQ 57
+#define RBH 58
+#define REMOTE_REF 59
+#define TVAR_WATCH_QUEUE 60
+#define INVARIANT_CHECK_QUEUE 61
+#define ATOMIC_INVARIANT 62
+#define TVAR 63
+#define TREC_CHUNK 64
+#define TREC_HEADER 65
+#define ATOMICALLY_FRAME 66
+#define CATCH_RETRY_FRAME 67
+#define CATCH_STM_FRAME 68
+#define WHITEHOLE 69
+#define N_CLOSURE_TYPES 70