From b62a7b02abaed21a387586379bd0c14e14595d9b Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 26 Feb 2012 01:04:42 -0800
Subject: [PATCH] Fix dangling references.

---
 src/runtime/framex.scm  | 17 ++++++++---------
 src/runtime/runtime.pkg |  2 --
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/runtime/framex.scm b/src/runtime/framex.scm
index 4a7025b47..1bb6e2859 100644
--- a/src/runtime/framex.scm
+++ b/src/runtime/framex.scm
@@ -136,9 +136,8 @@ USA.
 
 (define (method/force-snap-thunk frame)
   (let ((promise (stack-frame/ref frame 1)))
-    (values (%make-combination
-	     (ucode-primitive force 1)
-	     (list (make-evaluated-object promise)))
+    (values (make-combination (ucode-primitive force 1)
+			      (list (make-evaluated-object promise)))
 	    undefined-environment
 	    (cond ((promise-forced? promise) undefined-expression)
 		  ((promise-non-expression? promise) unknown-expression)
@@ -147,7 +146,7 @@ USA.
 					   (promise-expression promise)))))))
 
 (define ((method/application-frame index) frame)
-  (values (%make-combination
+  (values (make-combination
 	   (make-evaluated-object (stack-frame/ref frame index))
 	   (stack-frame-list frame (1+ index)))
 	  undefined-environment
@@ -165,17 +164,17 @@ USA.
 	  undefined-expression))
 
 (define (method/compiler-lookup-apply-trap-restart frame)
-  (values (%make-combination (make-variable (stack-frame/ref frame 2))
-			     (stack-frame-list frame 6))
+  (values (make-combination (make-variable (stack-frame/ref frame 2))
+			    (stack-frame-list frame 6))
 	  (stack-frame/ref frame 3)
 	  undefined-expression))
 
 (define (method/compiler-error-restart frame)
   (let ((primitive (stack-frame/ref frame 2)))
     (if (primitive-procedure? primitive)
-	(values (%make-combination (make-variable 'apply)
-				   (list primitive
-					 unknown-expression))
+	(values (make-combination (make-variable 'apply)
+				  (list primitive
+					unknown-expression))
 		undefined-environment
 		undefined-expression)
 	(stack-frame/debugging-info/default frame))))
diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 7159dab86..0494eb7f7 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -3647,8 +3647,6 @@ USA.
 	  unassigned?-name
 	  unassigned??
 	  undefined-conditional-branch)
-  (export (runtime debugging-info)
-	  %make-combination)
   (initialization (initialize-package!)))
 
 (define-package (runtime scode-data)
-- 
2.25.1