Improve error reporting for kind errors (fix Trac #1633)

[ghc-hetmet.git] / includes / Closures.h

diff --git a/includes/Closures.h b/includes/Closures.h
index d5458f4..15955fd 100644 (file)
--- a/includes/Closures.h
+++ b/includes/Closures.h
@@ -174,11 +174,6 @@ typedef struct {
 } StgStopFrame;  
 
 typedef struct {
-    StgHeader   header;
-    StgClosure *evacuee;
-} StgEvacuated;
-
-typedef struct {
   StgHeader header;
   StgWord data;
 } StgIntCharlikeClosure;
@@ -195,6 +190,7 @@ typedef struct _StgStableName {
 
 typedef struct _StgWeak {      /* Weak v */
   StgHeader header;
+  StgClosure *cfinalizer;
   StgClosure *key;
   StgClosure *value;           /* v */
   StgClosure *finalizer;
@@ -232,7 +228,6 @@ typedef struct {
     StgArrWords   *instrs;     /* a pointer to an ArrWords */
     StgArrWords   *literals;   /* a pointer to an ArrWords */
     StgMutArrPtrs *ptrs;       /* a pointer to a  MutArrPtrs */
-    StgArrWords   *itbls;      /* a pointer to an ArrWords */
     StgHalfWord   arity;        /* arity of this BCO */
     StgHalfWord   size;         /* size of this BCO (in words) */
     StgWord       bitmap[FLEXIBLE_ARRAY];  /* an StgLargeBitmap */