about summary refs log tree commit diff stats
path: root/mu.arc
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2014-12-14 08:06:32 -0800
committerKartik K. Agaram <vc@akkartik.com>2014-12-14 08:06:32 -0800
commitb613977c767d8a740bf9b43bd35f570c247fc10f (patch)
treedfb7ab8c580068b67c55ff5cd74994dceff19290 /mu.arc
parent67737e857e9b2b68b85785734eef9c5043e9bc4d (diff)
downloadmu-b613977c767d8a740bf9b43bd35f570c247fc10f.tar.gz
419 - layer 11 now passing
Diffstat (limited to 'mu.arc')
-rw-r--r--mu.arc6
1 files changed, 3 insertions, 3 deletions
diff --git a/mu.arc b/mu.arc
index ad060f5f..cdadc9f9 100644
--- a/mu.arc
+++ b/mu.arc
@@ -907,7 +907,7 @@
               (when (maybe-add arg location idx)
                 (trace "cn0" "location for arg " arg ": " idx)
                 ; todo: can't allocate arrays on the stack
-                (++ idx (sizeof ty.arg)))))))))
+                (++ idx (sizeof ty.arg.0)))))))))
     (trace "cn1" "update names " canon.location " " canon.isa-field)
     (each instr instrs
       (when (acons instr)
@@ -923,11 +923,11 @@
 (def maybe-add (arg location idx)
   (trace "maybe-add" arg)
   (when (and nondummy.arg
-             (~in ty.arg 'literal 'offset 'fn)
+             (~in ty.arg.0 'literal 'offset 'fn)
              (~location v.arg)
              (isa v.arg 'sym)
              (~in v.arg 'nil 'default-scope)
-             (~pos 'global metadata.arg))
+             (~assoc 'global metadata.arg))
     (= (location v.arg) idx)))
 
 ;; literate tangling system for reordering code