[Guile-commits] 03/36: check symbols constants uninterned

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-elisp
in repository guile.

commit 175b64aed21df66061e00d2a7063fc6533f08d66
Author: Robin Templeton <address@hidden>
Date:   Tue Jun 10 22:57:05 2014 -0400

    check symbols constants uninterned
    
    (Best-ability ChangeLog annotation added by Christopher Allan Webber.)
    
    * module/system/vm/assembler.scm (intern-constant, link-data):
      Update to check "symbol-interned?".
---
 module/system/vm/assembler.scm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm
index efc370a..38cce27 100644
--- a/module/system/vm/assembler.scm
+++ b/module/system/vm/assembler.scm
@@ -1038,7 +1038,7 @@ table, its existing label is used directly."
      ((static-procedure? obj)
       `((static-patch! ,label 1 ,(static-procedure-code obj))))
      ((cache-cell? obj) '())
-     ((symbol? obj)
+     ((and (symbol? obj) (symbol-interned? obj))
       `((make-non-immediate 1 ,(recur (symbol->string obj)))
         (string->symbol 1 1)
         (static-set! 1 ,label 0)))
@@ -1509,7 +1509,7 @@ should be .data or .rodata), and return the resulting 
linker object.
                 (write-constant-reference buf pos elt)
                 (lp (1+ i)))))))
 
-       ((symbol? obj)
+       ((and (symbol? obj) (symbol-interned? obj))
         (write-placeholder asm buf pos))
 
        ((keyword? obj)