From ae5a466202defb484352dfce75efc0ee927e008d Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 1 Jun 1987 21:05:25 +0000
Subject: [PATCH] Install better code for lookup-apply in the cached-variable
 case.  Do in-line coding of reference-trap type test.

---
 v7/src/compiler/rtlgen/rgcomb.scm | 64 +++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/v7/src/compiler/rtlgen/rgcomb.scm b/v7/src/compiler/rtlgen/rgcomb.scm
index e3161b4d5..a1d7a31c8 100644
--- a/v7/src/compiler/rtlgen/rgcomb.scm
+++ b/v7/src/compiler/rtlgen/rgcomb.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/rtlgen/rgcomb.scm,v 1.21 1987/05/31 22:57:55 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/rtlgen/rgcomb.scm,v 1.22 1987/06/01 21:05:25 cph Exp $
 
 Copyright (c) 1987 Massachusetts Institute of Technology
 
@@ -255,26 +255,6 @@ MIT in each case. |#
 				 (prefix combination frame-size)
 				 continuation))))
 
-(define (make-call/lookup combination operator operands prefix
-			  continuation)
-  (make-call false combination operator operands
-    (lambda (frame-size)
-      (let ((operator (subproblem-value (combination-operator combination))))
-	(let ((name (variable-name (reference-variable operator))))
-	  (if compiler:cache-free-variables?
-	      (rtl:make-invocation:cache-reference
-	       frame-size
-	       (prefix combination frame-size)
-	       continuation
-	       name)
-	      (let ((block (reference-block operator)))
-		(rtl:make-invocation:lookup
-		 frame-size
-		 (prefix combination frame-size)
-		 continuation
-		 (nearest-ic-block-expression block)
-		 (intern-scode-variable! block name)))))))))
-
 (define (make-call/unknown combination operator operands prefix
 			   continuation)
   (let ((callee (subproblem-value (combination-operator combination))))
@@ -300,6 +280,48 @@ MIT in each case. |#
        continuation
        (constant-value (combination-known-operator combination))))))
 
+(define (make-call/lookup combination operator operands prefix
+			  continuation)
+  (make-call false combination operator operands
+    (lambda (frame-size)
+      (let ((operator (subproblem-value (combination-operator combination)))
+	    (frame-size* (1+ frame-size)))
+	(let ((name (variable-name (reference-variable operator))))
+	  (if compiler:cache-free-variables?
+	      (let* ((temp (make-temporary))
+		     (cell (rtl:make-fetch temp))
+		     (contents (rtl:make-fetch cell)))
+		(let ((n1 (rtl:make-assignment temp
+					       (rtl:make-variable-cache name)))
+		      (n2 (rtl:make-type-test (rtl:make-object->type contents)
+					      (ucode-type reference-trap)))
+		      (n3
+		       (scfg*scfg->scfg!
+			(rtl:make-push contents)
+			(rtl:make-invocation:apply
+			 frame-size*
+			 (prefix combination frame-size*)
+			 continuation)))
+		      (n4
+		       (rtl:make-invocation:cache-reference
+			frame-size*
+			(prefix combination frame-size)
+			continuation
+			cell)))
+		  (scfg-next-connect! n1 n2)
+		  (pcfg-consequent-connect! n2 n4)
+		  (pcfg-alternative-connect! n2 n3)
+		  (make-scfg (cfg-entry-node n1)
+			     (hooks-union (scfg-next-hooks n3)
+					  (scfg-next-hooks n4)))))
+	      (let ((block (reference-block operator)))
+		(rtl:make-invocation:lookup
+		 frame-size
+		 (prefix combination frame-size)
+		 continuation
+		 (nearest-ic-block-expression block)
+		 (intern-scode-variable! block name)))))))))
+
 (define (make-call/child combination operator operands make-receiver)
   (scfg*scfg->scfg!
    (make-receiver (block-frame-size (combination-block combination)))
-- 
2.25.1