summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Katzman <dougk@google.com>2024-05-30 08:53:32 -0400
committerDouglas Katzman <dougk@google.com>2024-05-30 08:53:32 -0400
commitdc890089a5548bc3dcfe11c358bc5a88957ba53b (patch)
treebe1471e248da0f824fe022690408edebd11b95ef
parente0d0ed7a69939f85e6213d8fa4f284775684a238 (diff)
Make dump-fop not hold on to a string designator for SB-FASLmain
thereby fixing the hide-packages test. And remove obsolete comment.
-rw-r--r--src/compiler/dump.lisp2
-rw-r--r--tests/hide-packages.test.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/dump.lisp b/src/compiler/dump.lisp
index da237decc..6006d0390 100644
--- a/src/compiler/dump.lisp
+++ b/src/compiler/dump.lisp
@@ -286,7 +286,7 @@
(if (typep fop-symbol '(cons (eql quote) (cons symbol null)))
(cadr fop-symbol)
(error "Bad 1st arg to DUMP-FOP: ~S" fop-symbol)))
- (val (or (gethash (intern (symbol-name fop-symbol) "SB-FASL")
+ (val (or (gethash (intern (symbol-name fop-symbol) #.(find-package "SB-FASL"))
*fop-name-to-opcode*)
(error "compiler bug: ~S is not a legal fasload operator."
fop-symbol)))
diff --git a/tests/hide-packages.test.sh b/tests/hide-packages.test.sh
index fc28c6307..da6fbaf94 100644
--- a/tests/hide-packages.test.sh
+++ b/tests/hide-packages.test.sh
@@ -38,7 +38,6 @@ CLOBBER_INTERNAL_FEATURES="(handler-bind ((simple-error #'continue))
### heap object aside from the package itself.
### Because SAVE-LISP-AND-DIE coalesces strings, this test provides confidence
### that no string anywhere in the heap is STRING= to a package name.
-### The better test is Test 2 below, which only passes on x86[-64] as yet.
run_sbcl <<EOF
#+cheneygc (exit) ; not much can be done for cheney to make this pass