[Guile-commits] 13/36: constant-interning fix

[Christopher Allan Webber]

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

commit 8a90afb9eea0d9cf790770d333de85aa7063428a
Author: Robin Templeton <address@hidden>
Date:   Fri Jul 18 17:41:48 2014 -0400

    constant-interning fix
    
    (Best-ability ChangeLog annotation added by Christopher Allan Webber.)
    
    * module/system/vm/assembler.scm (intern-constant): Switch from using
      vector-ref/immediate to make-short-immediate.
---
 module/system/vm/assembler.scm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm
index 38cce27..3b8f895 100644
--- a/module/system/vm/assembler.scm
+++ b/module/system/vm/assembler.scm
@@ -1073,7 +1073,8 @@ table, its existing label is used directly."
      (else
       (if (asm-to-file? asm)
           (error "don't know how to intern" obj)
-          `((vector-ref/immediate 1 0 ,(vlist-length (asm-constants asm)))
+          `((make-short-immediate 1 ,(vlist-length (asm-constants asm)))
+            (vector-ref 1 0 1)
             (static-set! 1 ,label 0))))))
   (cond
    ((immediate-bits asm obj) #f)