From e793bda9b43dc0fdcc583543a716700cea230792 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 5 Dec 2018 23:42:49 -0800
Subject: [PATCH] Fix some minor bugs in syntax renaming.

---
 src/runtime/syntax-rename.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/runtime/syntax-rename.scm b/src/runtime/syntax-rename.scm
index cf0138263..c6b0b9347 100644
--- a/src/runtime/syntax-rename.scm
+++ b/src/runtime/syntax-rename.scm
@@ -121,9 +121,11 @@ USA.
 			  bound)))
     (for-each (lambda (rename)
 		(let ((original (rename->original rename)))
-		  (if (not (any (lambda (rename*)
-				  (eq? original (rename->original rename*)))
-				free))
+		  (if (and (symbol? original)
+			   (not (any (lambda (rename*)
+				       (eq? original
+					    (rename->original rename*)))
+				     free)))
 		      (mark-safe! rename original))))
 	      bound)
     free))
@@ -152,11 +154,11 @@ USA.
 	  (if entry
 	      (cdr entry)
 	      (let ((finalized
-		     (symbol "." original
+		     (symbol "." (identifier->symbol original)
 			     "." frame-id
 			     "-" (length (cdr bucket)))))
 		(set-cdr! bucket
-			  (cons (cons original finalized)
+			  (cons (cons frame-id finalized)
 				(cdr bucket)))
 		finalized)))))
 
-- 
2.25.1