Separate StablePtr and StableName tables (#7674)

To improve performance of StablePtr.

1 files changed, 10 insertions, 7 deletions

diff --git a/includes/rts/Stable.h b/includes/rts/Stable.h
index ec867e486c..9f785eea01 100644
--- a/includes/rts/Stable.h
+++ b/includes/rts/Stable.h
@@ -21,19 +21,22 @@ StgStablePtr getStablePtr  (StgPtr p);
    PRIVATE from here.
    -------------------------------------------------------------------------- */
 
-typedef struct { 
-  StgPtr  addr;			/* Haskell object, free list, or NULL */
-  StgPtr  old;			/* old Haskell object, used during GC */
-  StgWord ref;			/* used for reference counting */
-  StgClosure *sn_obj;		/* the StableName object (or NULL) */
+typedef struct {
+    StgPtr  addr;			/* Haskell object, free list, or NULL */
+    StgPtr  old;			/* old Haskell object, used during GC */
+    StgClosure *sn_obj;		/* the StableName object (or NULL) */
 } snEntry;
 
-extern DLL_IMPORT_RTS snEntry *stable_ptr_table;
+typedef struct {
+    StgPtr addr;
+} spEntry;
+
+extern DLL_IMPORT_RTS snEntry *stable_name_table;
+extern DLL_IMPORT_RTS spEntry *stable_ptr_table;
 
 EXTERN_INLINE
 StgPtr deRefStablePtr(StgStablePtr sp)
 {
-    ASSERT(stable_ptr_table[(StgWord)sp].ref > 0);
     return stable_ptr_table[(StgWord)sp].addr;
 }