diff --git a/compiler/ir1opt.lisp b/compiler/ir1opt.lisp
index 8eaa001f9de4b855ad624661c032a6c18cddc45b..bbf70cc181e0332716b18d5da582605676e40a0a 100644
--- a/compiler/ir1opt.lisp
+++ b/compiler/ir1opt.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1opt.lisp,v 1.59 1993/03/19 17:05:23 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1opt.lisp,v 1.60 1993/05/11 13:54:57 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -850,7 +850,8 @@
   (declare (type combination call))
   (let* ((ref (continuation-use (basic-combination-fun call)))
 	 (leaf (when (ref-p ref) (ref-leaf ref)))
-	 (inlinep (if (defined-function-p leaf)
+	 (inlinep (if (and (defined-function-p leaf)
+			   (not *byte-compiling*))
 		      (defined-function-inlinep leaf)
 		      :no-chance)))
     (cond
@@ -1010,7 +1011,11 @@
 	      (policy node (>= speed brevity))
 	      (policy node (> speed brevity))))
 	 (*compiler-error-context* node))
-    (cond ((or (not constrained)
+    (cond ((let ((when (transform-when transform)))
+	     (not (or (eq when :both)
+		      (eq when (if *byte-compiling* :byte :native)))))
+	   t)
+	  ((or (not constrained)
 	       (valid-function-use node type :strict-result t))
 	   (multiple-value-bind
 	       (severity args)