From 3ce15462dc0b5cc77f771df5c56d44a2dde35aa3 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Fri, 4 Jan 2019 16:07:17 -0500
Subject: [PATCH] Cleanup and bug fixes

---
 scheme/cyclone/cps-opt-analyze-call-graph.scm | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/scheme/cyclone/cps-opt-analyze-call-graph.scm b/scheme/cyclone/cps-opt-analyze-call-graph.scm
index 56de0c83..171c20a6 100644
--- a/scheme/cyclone/cps-opt-analyze-call-graph.scm
+++ b/scheme/cyclone/cps-opt-analyze-call-graph.scm
@@ -22,32 +22,33 @@
             )
     ))
 
-;; TODO:
-;; analyze call graph. not exactly sure how this is going to work yet, but the goal is to be able to figure out which
-;; variables a primitive call is dependent upon. We then need to be able to query if any of those variables are mutated 
-;; (ideally in fnc body) in which case we cannot inline the prim call.
-;; 
-;; Notes:
-;; Should we pass a copy of the current call graph and then dump it off when a new variable is encountered? In which case, when do we reset the graph? Maybe we just build it up as an a-list as we go, so it resets itself automatically? Then each a-list can exist as part of analysis DB for the variable... would that work?
-
+;; symbol -> hash-table -> boolean
 ;; Is it OK to inline code replacing ref, based on call graph data from lookup table?
 (define (inline-ok-from-call-graph? ref tbl)
-  (and-let* ((vars (hash-table-ref/default tbl ref #f))
-             ((pair? vars))
-            )
+;(let ((result 
+  (let ((vars (hash-table-ref/default tbl ref #f)))
     (call/cc
       (lambda (return)
-        (for-each 
-          (lambda (v)
-            (and-let* ((adb-var (adb:get/default v #f)))
-              (when (not (adbv:inlinable adb-var))
-                ;(trace:error `(cannot inline ,ref))
-                (return #f))
+        (when (pair? vars)
+          ;; If there are vars, make sure each one is safe to inline
+          (for-each 
+            (lambda (v)
+              (and-let* ((adb-var (adb:get/default v #f)))
+                (when (not (adbv:inlinable adb-var))
+                  ;(trace:error `(cannot inline ,ref))
+                  (return #f))
+              )
             )
-          )
-          (cdr vars)) ;; Skip ref itself
+            (cdr vars))) ;; Skip ref itself
         (return #t)))))
+;)
+;(trace:error `(inline-ok-from-call-graph? ,result ,ref ,(hash-table-ref/default tbl ref #f)))
+;result))
 
+
+;; Analyze call graph. The goal is to be able to figure out which variables a primitive call 
+;; is dependent upon. We then need to be able to query if any of those variables are mutated 
+;; (ideally in fnc body) in which case we cannot inline the prim call.
 (define (analyze:build-call-graph sexp)
   ;; Add new entry for each var as it is found...
   (define lookup-tbl (make-hash-table))
@@ -128,6 +129,14 @@
     (define sexp
 '(
 
+;; Test case from compiler benchmark.
+;; The original code is:
+;; (define (test obj)
+;;   (let ((m (length (queue->list objects-dumped))))
+;;     (queue-put! objects-dumped obj)
+;;     (queue-put! object-queue obj)
+;;     m))
+
  (define test
    (lambda
      (k$38 obj$5$11)