Changeset 15261 for release/1.7/source

Timestamp:

Mar 21, 2012, 12:08:15 AM (9 years ago)

Author:

rme

Message:

GC safety fix to x8632 init-closure vinsn from trunk.

Location:

release/1.7/source

Files:

• . (modified) (1 prop)
• compiler/X86/X8632/x8632-vinsns.lisp (modified) (2 diffs)
• level-0/l0-cfm-support.lisp (modified) (1 prop)

release/1.7/source/compiler/X86/X8632/x8632-vinsns.lisp

@@ -3356 +3356 @@
   (movb (:$b 6) (:@ x8632::misc-data-offset (:%l closure))) ;imm word count
   (movb (:$b #xbf) (:@ (+ x8632::misc-data-offset 2) (:%l closure))) ;movl $self, %fn
-  (movl (:%l closure) (:@ (+ x8632::misc-data-offset 3) (:%l closure)))
   (movb (:$b #xff) (:@ (+ x8632::misc-data-offset 7) (:%l closure))) ;jmp
   (movl (:$l #x0150b425) (:@ (+ x8632::misc-data-offset 8) (:%l closure))) ;.SPcall-closure
@@ -3362 +3361 @@
   ;; (movl ($ 0) (:@ (+ x8632::misc-data-offset 12))) ;"end" of self-references
   (movb (:$b 7) (:@ (+ x8632::misc-data-offset 16) (:%l closure))) ;self-reference offset
-  (movb (:$b x8632::function-boundary-marker) (:@ (+ x8632::misc-data-offset 20) (:%l closure))))
+  (movb (:$b x8632::function-boundary-marker) (:@ (+ x8632::misc-data-offset 20) (:%l closure)))
+  ;; If the GC moved the closure before we finished creating its
+  ;; self-reference table, it wouldn't have updated this self-reference
+  (movl (:%l closure) (:@ (+ x8632::misc-data-offset 3) (:%l closure))))
 
 (define-x8632-vinsn finalize-closure (((closure :lisp))