X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftarget-disassem.lisp;h=24ad01898fdd738c29531c4728bfe76afcb63a66;hb=40e3ba03d0e1b824e4d1ae75d74246b975b70964;hp=9bcfd33f8e438ea59c0a183fe400ec7b9d2e274e;hpb=d604a358d8e5eb5587989e0a4f1d31dbe6ac5ffe;p=sbcl.git diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp index 9bcfd33..24ad018 100644 --- a/src/compiler/target-disassem.lisp +++ b/src/compiler/target-disassem.lisp @@ -1495,7 +1495,7 @@ (error "can't compile a lexical closure")) (compile nil lambda))) -(defun compiled-fun-or-lose (thing &optional (name thing)) +(defun valid-extended-function-designator-for-disassemble-p (thing) (cond ((legal-fun-name-p thing) (compiled-fun-or-lose (fdefinition thing) thing)) ((functionp thing) @@ -1503,8 +1503,17 @@ ((and (listp thing) (eq (car thing) 'lambda)) (compile nil thing)) - (t - (error "can't make a compiled function from ~S" name)))) + (t nil))) + +(defun compiled-fun-or-lose (thing &optional (name thing)) + (let ((fun (valid-extended-function-designator-for-disassemble-p thing))) + (if fun + fun + (error 'simple-type-error + :datum thing + :expected-type '(satisfies valid-extended-function-designator-for-disassemble-p) + :format-control "can't make a compiled function from ~S" + :format-arguments (list name))))) (defun disassemble (object &key (stream *standard-output*)