From 85f8f989629111e8d27d967ff12f658305e4a908 Mon Sep 17 00:00:00 2001 From: Jan Moringen Date: Sat, 4 Jun 2016 14:29:45 +0200 Subject: [PATCH] Fix build with sb-fluid Some function were declared [maybe-]inline when #!-sb-fluid, while callers had unconditional local inline declarations. With the new stricter warning handling, the failed inlining attempts made the build fail. --- src/code/bignum.lisp | 4 ++-- src/code/room.lisp | 5 +++-- src/code/target-random.lisp | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/code/bignum.lisp b/src/code/bignum.lisp index 1e9cb9147..c87506b58 100644 --- a/src/code/bignum.lisp +++ b/src/code/bignum.lisp @@ -1939,7 +1939,7 @@ (declare (type bignum-type result) (type bignum-length len) (muffle-conditions compiler-note) - (inline %normalize-bignum-buffer)) + #!-sb-fluid (inline %normalize-bignum-buffer)) (let ((newlen (%normalize-bignum-buffer result len))) (declare (type bignum-length newlen)) (unless (= newlen len) @@ -1958,7 +1958,7 @@ (defun %mostly-normalize-bignum (result len) (declare (type bignum-type result) (type bignum-length len) - (inline %normalize-bignum-buffer)) + #!-sb-fluid (inline %normalize-bignum-buffer)) (let ((newlen (%normalize-bignum-buffer result len))) (declare (type bignum-length newlen)) (unless (= newlen len) diff --git a/src/code/room.lisp b/src/code/room.lisp index 199d01b81..21e28919c 100644 --- a/src/code/room.lisp +++ b/src/code/room.lisp @@ -692,7 +692,7 @@ (declare (type spaces space) (type (or index null) larger smaller type count) (type (or function null) test) - (inline map-allocated-objects)) + #!-sb-fluid (inline map-allocated-objects)) (unless *ignore-after* (setq *ignore-after* (cons 1 2))) (collect ((counted 0 1+)) @@ -739,7 +739,8 @@ #!-stack-grows-downward-not-upward (sap+ sp (- n-word-bytes)))))) (defun map-referencing-objects (fun space object) - (declare (type spaces space) (inline map-allocated-objects)) + (declare (type spaces space) + #!-sb-fluid (inline map-allocated-objects)) (unless *ignore-after* (setq *ignore-after* (cons 1 2))) (flet ((maybe-call (fun obj) diff --git a/src/code/target-random.lisp b/src/code/target-random.lisp index fa07f4656..e9437cd11 100644 --- a/src/code/target-random.lisp +++ b/src/code/target-random.lisp @@ -405,8 +405,9 @@ http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html (accept-reject-loop big-random-chunk)))))) (defun random (arg &optional (state *random-state*)) - (declare (inline %random-fixnum %random-single-float %random-double-float - #!+long-float %random-long-float)) + #!-sb-fluid (declare (inline %random-fixnum + %random-single-float %random-double-float + #!+long-float %random-long-float)) (declare (explicit-check)) (cond ((and (fixnump arg) (> arg 0)) -- 2.11.4.GIT