Changeset 7791

Timestamp:

Nov 30, 2007, 12:46:28 PM (17 years ago)

Author:

Gary Byers

Message:

Don't set the "puntable" bit on constant-valued pointers that have
dynamic-extent.

File:

• branches/working-0711/ccl/compiler/nx0.lisp (modified) (4 diffs)

branches/working-0711/ccl/compiler/nx0.lisp

@@ -979 +979 @@
   (let* ((bits (nx-var-bits var))
          (mask (%ilogior (%ilsl $vbitsetq 1) (ash -1 $vbitspecial) (%ilsl $vbitclosed 1)))
-         ;(count (%i+ (%ilogand $vrefmask bits) (%ilsr 8 (%ilogand $vsetqmask bits))))
          (nrefs (%ilogand $vrefmask bits))
          (val (nx-untyped-form initform))
@@ -986 +985 @@
       (if
         (or 
-         ;(%izerop count)  ; unreferenced vars can still have side effects
          (nx-t val)
          (nx-null val)
-         (and (eql nrefs 1) ( acode-absolute-ptr-p val t))
+         (and (eql nrefs 1) (not (logbitp $vbitdynamicextent bits)) ( acode-absolute-ptr-p val t))
          (eq op (%nx1-operator fixnum))
          (eq op (%nx1-operator immediate)))
-        (nx-set-var-bits var (%ilogior (%ilsl $vbitpuntable 1) bits))))
+        (progn
+          (nx-set-var-bits var (%ilogior (%ilsl $vbitpuntable 1) bits)))))
     (when (and (%ilogbitp $vbitdynamicextent bits)
                (or (eq op (%nx1-operator closed-function))
@@ -1219 +1218 @@
            (boundtobits (nx-var-bits boundto)))
       (declare (fixnum varbits boundtobits))
-
       (unless (eq (%ilogior
                     (%ilsl $vbitsetq 1)
@@ -1228 +1226 @@
                       (%ilsl $vbitclosed 1))
                     boundtobits))
-        ; Can't happen -
+        ;; Can't happen -
         (unless (%izerop (%ilogand (%ilogior
                                      (%ilsl $vbitsetq 1)