0.9.2.18: various error &co reporting improvements and build tweaks

[sbcl.git] / src / code / linkage-table.lisp

diff --git a/src/code/linkage-table.lisp b/src/code/linkage-table.lisp
index 31d561d..3ccfb4c 100644 (file)
--- a/src/code/linkage-table.lisp
+++ b/src/code/linkage-table.lisp
@@ -48,15 +48,15 @@
   (let ((table-address (+ (* (hash-table-count *linkage-info*)
                             sb!vm:linkage-table-entry-size)
                          sb!vm:linkage-table-space-start))
-       (real-address (get-dynamic-foreign-symbol-address name)))
-    (when real-address
-      (unless (< table-address sb!vm:linkage-table-space-end)
-       (error "Linkage-table full (~D entries): cannot link ~S."
-              (hash-table-count *linkage-info*)
-              name))
-      (write-linkage-table-entry table-address real-address datap)
-      (setf (gethash name *linkage-info*)
-           (make-linkage-info :address table-address :datap datap)))))
+       (real-address (get-dynamic-foreign-symbol-address name datap)))
+    (aver real-address)
+    (unless (< table-address sb!vm:linkage-table-space-end)
+      (error "Linkage-table full (~D entries): cannot link ~S."
+             (hash-table-count *linkage-info*)
+             name))
+    (write-linkage-table-entry table-address real-address datap)
+    (setf (gethash name *linkage-info*)
+          (make-linkage-info :address table-address :datap datap))))
 
 ;;; Add a foreign linkage entry if none exists, return the address
 ;;; in the linkage table.
@@ -74,18 +74,12 @@
 (defun update-linkage-table ()
   ;; Doesn't take care of it's own locking -- callers are responsible
   (maphash (lambda (name info)
-             (let ((datap (linkage-info-datap info))
-                   (table-address (linkage-info-address info))
-                   (real-address (get-dynamic-foreign-symbol-address name)))
-               (cond (real-address
-                      (write-linkage-table-entry table-address
-                                                 real-address
-                                                 datap))
-                     (t
-                      (/show0 "oops")
-                      (cerror "Ignore. Attempts to access this foreign symbol ~
-                               will lead to badness characterized by ~
-                               segfaults, and potential corruption."
-                              "Could not resolve foreign function ~S for ~
-                               linkage-table." name)))))
+             (let* ((datap (linkage-info-datap info))
+                   (table-address (linkage-info-address info))
+                   (real-address 
+                    (get-dynamic-foreign-symbol-address name datap)))
+              (aver (and table-address real-address))
+              (write-linkage-table-entry table-address
+                                         real-address
+                                         datap)))
            *linkage-info*))