From bc382783a653d8051718b9712c8c873eea2c8bbf Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Tue, 13 Feb 2007 07:40:38 +0000 Subject: [PATCH] 1.0.2.25: Better MUFFLE-CONDITIONS handling for inlined functions * Inherit MUFFLE-CONDITIONS from the call-site lexenv. Otherwise it's basically impossible to selectively muffle "alien runtime allocation" notes, at least for SB-GROVELed alien functions. --- src/compiler/ir1tran-lambda.lisp | 4 ++++ version.lisp-expr | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/ir1tran-lambda.lisp b/src/compiler/ir1tran-lambda.lisp index 2486661..f424f51 100644 --- a/src/compiler/ir1tran-lambda.lisp +++ b/src/compiler/ir1tran-lambda.lisp @@ -1018,6 +1018,10 @@ `(,(car x) . (macro . ,(coerce (cdr x) 'function)))) macros) + ;; Inherit MUFFLE-CONDITIONS from the call-site lexenv + ;; rather than the definition-site lexenv, since it seems + ;; like a much more common case. + :handled-conditions (lexenv-handled-conditions *lexenv*) :policy (lexenv-policy *lexenv*))) (*allow-instrumenting* (and (not system-lambda) *allow-instrumenting*))) (ir1-convert-lambda `(lambda ,@body) diff --git a/version.lisp-expr b/version.lisp-expr index 0331e9f..6ad040e 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.2.24" +"1.0.2.25" -- 1.7.10.4