From c5ddd79aff62e0dbc9fbd077e35f928a9e73d2e4 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 23 Aug 2017 16:30:18 +0000
Subject: [PATCH] Added opt:add-inlinable-functions

---
 scheme/cyclone/cps-optimizations.sld | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/scheme/cyclone/cps-optimizations.sld b/scheme/cyclone/cps-optimizations.sld
index 1948d24e..92a66c9e 100644
--- a/scheme/cyclone/cps-optimizations.sld
+++ b/scheme/cyclone/cps-optimizations.sld
@@ -23,6 +23,7 @@
       optimize-cps 
       analyze-cps
       ;analyze-lambda-side-effects
+      opt:add-inlinable-functions
       opt:contract
       opt:inline-prims
       opt:beta-expand
@@ -62,7 +63,13 @@
       adbf:side-effects adbf:set-side-effects!
   )
   (begin
-    (define 
+    ;; The following two defines allow non-CPS functions to still be considered
+    ;; for certain inlining optimizations.
+    (define *inlinable-functions* '())
+    (define (opt:add-inlinable-functions lis)
+      (set! *inlinable-functions* lis))
+
+    (define
       *contract-env* 
       (let ((env (create-environment '() '())))
         (eval '(define Cyc-fast-plus +) env)
@@ -1194,8 +1201,10 @@
           (analyze:find-inlinable-vars (if->else exp) args))
         ((app? exp)
          (cond
-          ((and (prim? (car exp))
-                (not (prim:mutates? (car exp))))
+          ((or
+            (member (car exp) *inlinable-functions*)
+            (and (prim? (car exp))
+                 (not (prim:mutates? (car exp)))))
            ;; If primitive does not mutate its args, ignore if ivar is used
            (for-each
             (lambda (e)