Changeset 12363

Timestamp:

Jul 3, 2009, 6:30:15 PM (10 years ago)

Author:

gz

Message:

Another code coverage fix in x862-trivial-p

File:

• branches/working-0711/ccl/compiler/X86/x862.lisp (modified) (2 diffs)

branches/working-0711/ccl/compiler/X86/x862.lisp

@@ -4823 +4823 @@
 ;;; "Trivial" means can be evaluated without allocating or modifying registers.
 ;;; Interim definition, which will probably stay here forever.
-(defun x862-trivial-p (form &optional reg &aux op bits)
-  (setq form (nx-untyped-form form))
+(defun x862-trivial-p (form &optional reg &aux untyped-form op bits)
+  (setq untyped-form (nx-untyped-form form))
   (and
-   (consp form)
-   (not (eq (setq op (%car form)) (%nx1-operator call)))
+   (consp untyped-form)
+   (not (eq (setq op (%car untyped-form)) (%nx1-operator call)))
    (or
-    (nx-null form)
-    (nx-t form)
+    (nx-null untyped-form)
+    (nx-t untyped-form)
     (eq op (%nx1-operator simple-function))
     (eq op (%nx1-operator fixnum))
@@ -4838 +4838 @@
     (and (or (eq op (%nx1-operator inherited-arg)) 
              (eq op (%nx1-operator lexical-reference)))
-         (or (%ilogbitp $vbitpunted (setq bits (nx-var-bits (cadr form))))
+         (or (%ilogbitp $vbitpunted (setq bits (nx-var-bits (cadr untyped-form))))
              (neq (%ilogior (%ilsl $vbitclosed 1) (%ilsl $vbitsetq 1))
                   (%ilogand (%ilogior (%ilsl $vbitclosed 1) (%ilsl $vbitsetq 1)) bits)))))