X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1report.lisp;h=ea341140ddffcd0b5529e9ed640c290f2a94c4f8;hb=ace140856e6b3f92bb06597092a59753f1e59142;hp=eadcf868f4a74fdcd5247f6b85b8e7d5d80c7910;hpb=e2b33e0d99f0f93263defcd2e0dffe20c4e388f3;p=sbcl.git diff --git a/src/compiler/ir1report.lisp b/src/compiler/ir1report.lisp index eadcf86..ea34114 100644 --- a/src/compiler/ir1report.lisp +++ b/src/compiler/ir1report.lisp @@ -72,7 +72,9 @@ ;; the file position at which the top level form starts, if applicable (file-position nil :type (or index null)) ;; the original source part of the source path - (original-source-path nil :type list)) + (original-source-path nil :type list) + ;; the lexenv active at the time + (lexenv nil :type (or null lexenv))) ;;; If true, this is the node which is used as context in compiler warning ;;; messages. @@ -97,25 +99,29 @@ ;;; it's a reasonable thing to put in SB-EXT in case some dedicated ;;; user wants to do some heavy tweaking to make SBCL give more ;;; informative output about his code. -(defmacro def-source-context (name lambda-list &body body) +(defmacro define-source-context (name lambda-list &body body) #!+sb-doc - "DEF-SOURCE-CONTEXT Name Lambda-List Form* + "DEFINE-SOURCE-CONTEXT Name Lambda-List Form* This macro defines how to extract an abbreviated source context from the Named form when it appears in the compiler input. Lambda-List is a DEFMACRO style lambda-list used to parse the arguments. The Body should return a list of subforms suitable for a \"~{~S ~}\" format string." (let ((n-whole (gensym))) `(setf (gethash ',name *source-context-methods*) - #'(lambda (,n-whole) - (destructuring-bind ,lambda-list ,n-whole ,@body))))) + (lambda (,n-whole) + (destructuring-bind ,lambda-list ,n-whole ,@body))))) -(def-source-context defstruct (name-or-options &rest slots) +(defmacro def-source-context (&rest rest) + (deprecation-warning 'def-source-context 'define-source-context) + `(define-source-context ,@rest)) + +(define-source-context defstruct (name-or-options &rest slots) (declare (ignore slots)) `(defstruct ,(if (consp name-or-options) (car name-or-options) name-or-options))) -(def-source-context function (thing) +(define-source-context function (thing) (if (and (consp thing) (eq (first thing) 'lambda) (consp (rest thing))) `(lambda ,(second thing)) `(function ,thing))) @@ -125,11 +131,14 @@ (defun source-form-context (form) (cond ((atom form) nil) ((>= (length form) 2) - (funcall (gethash (first form) *source-context-methods* - #'(lambda (x) - (declare (ignore x)) - (list (first form) (second form)))) - (rest form))) + (let* ((context-fun-default (lambda (x) + (declare (ignore x)) + (list (first form) (second form)))) + (context-fun (gethash (first form) + *source-context-methods* + context-fun-default))) + (declare (type function context-fun)) + (funcall context-fun (rest form)))) (t form))) @@ -188,22 +197,6 @@ (format nil "~<~@; ~S~:>" (list form)) (prin1-to-string form))))) -;;; shorthand for creating debug names from source names or other -;;; stems, e.g. -;;; (DEBUG-NAMIFY "FLET ~S" SOURCE-NAME) -;;; (DEBUG-NAMIFY "top level form ~S" FORM) -;;; -;;; FIXME: This function seems to have a lot in common with -;;; STRINGIFY-FORM, and perhaps there's some way to merge the two -;;; functions. -(defun debug-namify (format-string &rest format-arguments) - (with-standard-io-syntax - (let ((*print-readably* nil) - (*package* *cl-package*) - (*print-length* 3) - (*print-level* 2)) - (apply #'format nil format-string format-arguments)))) - ;;; Return a COMPILER-ERROR-CONTEXT structure describing the current ;;; error context, or NIL if we can't figure anything out. ARGS is a ;;; list of things that are going to be printed out in the error @@ -248,7 +241,10 @@ (declare (ignore ignore)) pos) :original-source-path - (source-path-original-source path)))))))))) + (source-path-original-source path) + :lexenv (if context + (node-lexenv context) + (if (boundp '*lexenv*) *lexenv* nil))))))))))) ;;;; printing error messages @@ -277,7 +273,7 @@ (cond ((= *last-message-count* 1) (when terpri (terpri *error-output*))) ((> *last-message-count* 1) - (format *error-output* "~&; [Last message occurs ~D times.]~2%" + (format *error-output* "~&; [Last message occurs ~W times.]~2%" *last-message-count*))) (setq *last-message-count* 0)) @@ -359,6 +355,8 @@ (setq *last-error-context* context) + ;; FIXME: this testing for effective equality of compiler messages + ;; is ugly, and really ought to be done at a higher level. (unless (and (equal format-string *last-format-string*) (tree-equal format-args *last-format-args*)) (note-message-repeats nil) @@ -384,48 +382,68 @@ (what (etypecase condition (style-warning 'style-warning) (warning 'warning) - (error 'error)))) - (multiple-value-bind (format-string format-args) - (if (typep condition 'simple-condition) - (values (simple-condition-format-control condition) - (simple-condition-format-arguments condition)) - (values "~A" - (list (with-output-to-string (s) - (princ condition s))))) - (print-compiler-message (format nil - "caught ~S:~% ~A" - what - format-string) - format-args))) + ((or error compiler-error) 'error)))) + (print-compiler-message + (format nil "caught ~S:~%~~@< ~~@;~~A~~:>" what) + (list (with-output-to-string (s) (princ condition s))))) (values)) -;;; COMPILER-NOTE is vaguely like COMPILER-ERROR and the other -;;; condition-signalling functions, but it just writes some output -;;; instead of signalling. (In CMU CL, it did signal a condition, but -;;; this didn't seem to work all that well; it was weird to have -;;; COMPILE-FILE return with WARNINGS-P set when the only problem was -;;; that the compiler couldn't figure out how to compile something as -;;; efficiently as it liked.) -(defun compiler-note (format-string &rest format-args) +;;; The act of signalling one of these beasts must not cause WARNINGSP +;;; (or FAILUREP) to be set from COMPILE or COMPILE-FILE, so we can't +;;; inherit from WARNING or STYLE-WARNING. +;;; +;;; FIXME: the handling of compiler-notes could be unified with +;;; warnings and style-warnings (see the various handler functions +;;; below). +(define-condition compiler-note (condition) () + (:documentation + "Root of the hierarchy of conditions representing information discovered +by the compiler that the user might wish to know, but which does not merit +a STYLE-WARNING (or any more serious condition).")) +(define-condition simple-compiler-note (simple-condition compiler-note) ()) +(define-condition code-deletion-note (simple-compiler-note) () + (:documentation + "A condition type signalled when the compiler deletes code that the user +has written, having proved that it is unreachable.")) + +(defun compiler-notify (datum &rest args) (unless (if *compiler-error-context* (policy *compiler-error-context* (= inhibit-warnings 3)) (policy *lexenv* (= inhibit-warnings 3))) - (incf *compiler-note-count*) - (print-compiler-message (format nil "note: ~A" format-string) - format-args)) + (let ((condition + (coerce-to-condition datum args + 'simple-compiler-note 'compiler-notify))) + (restart-case + (signal condition) + (muffle-warning () + (return-from compiler-notify (values)))) + (incf *compiler-note-count*) + (print-compiler-message + (format nil "note: ~~A") + (list (with-output-to-string (s) (princ condition s)))))) (values)) ;;; Issue a note when we might or might not be in the compiler. -(defun maybe-compiler-note (&rest rest) +(defun maybe-compiler-notify (&rest rest) (if (boundp '*lexenv*) ; if we're in the compiler - (apply #'compiler-note rest) - (let ((stream *error-output*)) - (pprint-logical-block (stream nil :per-line-prefix ";") - - (format stream " note: ~3I~_") - (pprint-logical-block (stream nil) - (apply #'format stream rest))) - (fresh-line stream)))) ; (outside logical block, no per-line-prefix) + (apply #'compiler-notify rest) + (progn + (let ((condition + (coerce-to-condition (car rest) (cdr rest) + 'simple-compiler-note + 'maybe-compiler-notify))) + (restart-case + (signal condition) + (muffle-warning () + (return-from maybe-compiler-notify (values)))) + (let ((stream *error-output*)) + (pprint-logical-block (stream nil :per-line-prefix ";") + (format stream " note: ~3I~_") + (pprint-logical-block (stream nil) + (format stream "~A" condition))) + ;; (outside logical block, no per-line-prefix) + (fresh-line stream))) + (values)))) ;;; The politically correct way to print out progress messages and ;;; such like. We clear the current error context so that we know that @@ -448,7 +466,7 @@ (aver ep) ; else no entry points?? (multiple-value-bind (form context) (find-original-source - (node-source-path (continuation-next (block-start ep)))) + (node-source-path (block-start-node ep))) (declare (ignore form)) (let ((*print-level* 2) (*print-pretty* nil)) @@ -513,13 +531,27 @@ ;; Check for boundness so we don't blow up if we're called ;; when IR1 conversion isn't going on. (boundp '*lexenv*) - ;; FIXME: I'm pretty sure the INHIBIT-WARNINGS test below - ;; isn't a good idea; we should have INHIBIT-WARNINGS - ;; affect compiler notes, not STYLE-WARNINGs. And I'm not - ;; sure what the BOUNDP '*LEXENV* test above is for; it's - ;; likely a good idea, but it probably deserves an - ;; explanatory comment. - (policy *lexenv* (= inhibit-warnings 3))) + (or + ;; FIXME: I'm pretty sure the INHIBIT-WARNINGS test below + ;; isn't a good idea; we should have INHIBIT-WARNINGS + ;; affect compiler notes, not STYLE-WARNINGs. And I'm not + ;; sure what the BOUNDP '*LEXENV* test above is for; it's + ;; likely a good idea, but it probably deserves an + ;; explanatory comment. + (policy *lexenv* (= inhibit-warnings 3)) + ;; KLUDGE: weird decoupling between here and where we're + ;; going to signal the condition. I don't think we can + ;; rewrite this using SIGNAL and RESTART-CASE (to take + ;; advantage of the (SATISFIES HANDLE-CONDITION-P) + ;; handler, because if that doesn't handle it the ordinary + ;; compiler handlers will trigger. + (typep + (ecase kind + (:variable (make-condition 'warning)) + ((:function :type) (make-condition 'style-warning))) + (car + (rassoc 'muffle-warning + (lexenv-handled-conditions *lexenv*)))))) (let* ((found (dolist (warning *undefined-warnings* nil) (when (and (equal (undefined-warning-name warning) name) (eq (undefined-warning-kind warning) kind))