1.0.25.11: Remove unused SIZE slot from catch-block structure.

diff --git a/src/compiler/alpha/vm.lisp b/src/compiler/alpha/vm.lisp
index cb32ab9..32103ed 100644 (file)
--- a/src/compiler/alpha/vm.lisp
+++ b/src/compiler/alpha/vm.lisp
@@ -117,7 +117,7 @@
       ((null classes)
        (nreverse forms))))
 
-(def!constant kludge-nondeterministic-catch-block-size 7)
+(def!constant kludge-nondeterministic-catch-block-size 6)
 
 (!define-storage-classes
 

diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp
index 2f455da..059cc32 100644 (file)
--- a/src/compiler/generic/objdef.lisp
+++ b/src/compiler/generic/objdef.lisp
@@ -295,8 +295,7 @@
   #!+win32 next-seh-frame
   #!+win32 seh-frame-handler
   tag
-  (previous-catch :c-type #!-alpha "struct catch_block *" #!+alpha "u32")
-  size)
+  (previous-catch :c-type #!-alpha "struct catch_block *" #!+alpha "u32"))
 
 ;;; (For an explanation of this, see the comments at the definition of
 ;;; KLUDGE-NONDETERMINISTIC-CATCH-BLOCK-SIZE.)

diff --git a/src/compiler/hppa/vm.lisp b/src/compiler/hppa/vm.lisp
index e7e8868..66f0fdd 100644 (file)
--- a/src/compiler/hppa/vm.lisp
+++ b/src/compiler/hppa/vm.lisp
@@ -112,7 +112,7 @@
       ((null classes)
        (nreverse forms))))
 
-(def!constant kludge-nondeterministic-catch-block-size 7)
+(def!constant kludge-nondeterministic-catch-block-size 6)
 
 (!define-storage-classes
 

diff --git a/src/compiler/mips/vm.lisp b/src/compiler/mips/vm.lisp
index c0b2f71..098e00d 100644 (file)
--- a/src/compiler/mips/vm.lisp
+++ b/src/compiler/mips/vm.lisp
@@ -114,7 +114,7 @@
       ((null classes)
        (nreverse forms))))
 
-(def!constant kludge-nondeterministic-catch-block-size 7)
+(def!constant kludge-nondeterministic-catch-block-size 6)
 
 (!define-storage-classes
 

diff --git a/src/compiler/ppc/vm.lisp b/src/compiler/ppc/vm.lisp
index 641a33f..97e8e0a 100644 (file)
--- a/src/compiler/ppc/vm.lisp
+++ b/src/compiler/ppc/vm.lisp
@@ -118,7 +118,7 @@
       ((null classes)
        (nreverse forms))))
 
-(def!constant kludge-nondeterministic-catch-block-size 7)
+(def!constant kludge-nondeterministic-catch-block-size 6)
 
 (define-storage-classes
 

diff --git a/src/compiler/sparc/vm.lisp b/src/compiler/sparc/vm.lisp
index 9bfe46b..65865ae 100644 (file)
--- a/src/compiler/sparc/vm.lisp
+++ b/src/compiler/sparc/vm.lisp
@@ -129,7 +129,7 @@
 ;;; and seems to be working so far    -dan
 ;;;
 ;;; arbitrarily taken for alpha, too. - Christophe
-(def!constant kludge-nondeterministic-catch-block-size 7)
+(def!constant kludge-nondeterministic-catch-block-size 6)
 
 (!define-storage-classes
 

diff --git a/src/compiler/x86-64/vm.lisp b/src/compiler/x86-64/vm.lisp
index 9f69ec4..7803220 100644 (file)
--- a/src/compiler/x86-64/vm.lisp
+++ b/src/compiler/x86-64/vm.lisp
@@ -208,7 +208,7 @@
 ;;; (What a KLUDGE! Anyone who wants to come in and clean up this mess
 ;;; has my gratitude.) (FIXME: Maybe this should be me..)
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (def!constant kludge-nondeterministic-catch-block-size 6))
+  (def!constant kludge-nondeterministic-catch-block-size 5))
 
 (!define-storage-classes
 

diff --git a/src/compiler/x86/vm.lisp b/src/compiler/x86/vm.lisp
index 4079bde..d0023c6 100644 (file)
--- a/src/compiler/x86/vm.lisp
+++ b/src/compiler/x86/vm.lisp
@@ -161,7 +161,7 @@
 ;;; has my gratitude.) (FIXME: Maybe this should be me..)
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (def!constant kludge-nondeterministic-catch-block-size
-      #!-win32 6 #!+win32 8))
+      #!-win32 5 #!+win32 7))
 
 (!define-storage-classes
 

diff --git a/version.lisp-expr b/version.lisp-expr
index b45d550..9063448 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.25.10"
+"1.0.25.11"