ASDF improvements for bytecode (#1456)

Author: yitzchak

.github/workflows/test.yml

@@ -77,6 +77,10 @@ jobs:
       if: ${{ matrix.build == 'clasp' }}
       run: |
         ninja -C build ansi-test
+    - name: Run ASDF tests
+      if: ${{ matrix.build == 'clasp' }}
+      run: |
+        ninja -C build asdf-test
     - name: Run Cando regression tests
       if: ${{ matrix.build == 'cando' }}
       run: |

repos.sexp

@@ -198,7 +198,7 @@
  (:name :asdf
   :repository "https://gitlab.common-lisp.net/yitzchak/asdf.git"
   :directory "src/lisp/modules/asdf/"
-  :branch "clasp-bytecode")
+  :branch "clasp-bytecode-2")
  (:name :mps
   :repository "https://github.com/Ravenbrook/mps.git"
   :directory "src/mps/"

src/core/lisp.cc

@@ -666,6 +666,9 @@ void Lisp::startupLispEnvironment() {
 #endif
 #ifdef CLASP_EXTENSIONS
   features = Cons_O::create(_lisp->internKeyword("EXTENSIONS"),features);
+#endif
+#if CLASP_BUILD_MODE == 6
+  features = Cons_O::create(_lisp->internKeyword("BYTECODE"), features);
 #endif
   cl::_sym_STARfeaturesSTAR->setf_symbolValue(features);
 

src/koga/configure.lisp

@@ -649,6 +649,8 @@ is not compatible with snapshots.")
                                                          (list (make-source #P"jupyter-kernel.lisp" :variant))
                                                          :ansi-test
                                                          (list (make-source #P"ansi-test.lisp" :build))
+                                                         :asdf-test
+                                                         (list (make-source #P"asdf-test.bash" :build))
                                                          :bench
                                                          (list (make-source #P"bench.lisp" :build))
                                                          :ninja

src/koga/ninja.lisp

@@ -152,6 +152,10 @@
                     :command "$clasp --norc --base --feature ignore-extensions --load ansi-test.lisp"
                     :description "Running ANSI tests"
                     :pool "console")
+  (ninja:write-rule output-stream :asdf-test
+                    :command "bash asdf-test.bash $clasp $target"
+                    :description "Running ASDF tests"
+                    :pool "console")
   (ninja:write-rule output-stream :test-random-integer
                     :command "$clasp --norc --base --feature ignore-extensions --load \"../dependencies/ansi-test/run-random-type-tests.lisp\""
                     :description "Running pfdietz test-random-integer-forms"
@@ -754,6 +758,16 @@
                      :clasp (make-source "iclasp" :variant)
                      :inputs (list (build-name "cclasp"))
                      :outputs (list (build-name "ansi-test")))
+  (ninja:write-build output-stream :asdf-test
+                     :clasp (make-source "iclasp" :variant)
+                     :target "t"
+                     :inputs (list (build-name "cclasp"))
+                     :outputs (list (build-name "asdf-test")))
+  (ninja:write-build output-stream :asdf-test
+                     :clasp (make-source "iclasp" :variant)
+                     :target "u"
+                     :inputs (list (build-name "cclasp"))
+                     :outputs (list (build-name "asdf-test-upgrade")))
   (ninja:write-build output-stream :test-random-integer
                      :clasp (make-source "iclasp" :variant)
                      :inputs (list (build-name "cclasp"))
@@ -776,6 +790,12 @@
     (ninja:write-build output-stream :phony
                        :inputs (list (build-name "ansi-test-subset"))
                        :outputs (list "ansi-test-subset"))
+    (ninja:write-build output-stream :phony
+                       :inputs (list (build-name "asdf-test"))
+                       :outputs (list "asdf-test"))
+    (ninja:write-build output-stream :phony
+                       :inputs (list (build-name "asdf-test-upgrade"))
+                       :outputs (list "asdf-test-upgrade"))
     (ninja:write-build output-stream :phony
                        :inputs (list (build-name "test-random-integer"))
                        :outputs (list "test-random-integer"))

src/koga/scripts.lisp

@@ -297,3 +297,17 @@ exec $(dirname \"$0\")/iclasp -f ignore-extensions --base \"$@\""))
         (t
          (load #P\"../dependencies/ansi-test/init.lsp\"))))
 (rt:do-tests :exit t :expected-failures \"../tools-for-build/ansi-test-expected-failures.sexp\")"))
+
+(defmethod print-prologue (configuration (name (eql :asdf-test)) output-stream)
+  (format output-stream "~
+CLASP=$(pwd)/$1
+WORK_DIR=`mktemp -d`
+
+if [[ ! \"$WORK_DIR\" || ! -d \"$WORK_DIR\" ]]; then
+  echo \"Could not create temp dir\"
+  exit 1
+fi
+
+cp -r ../src/lisp/modules/asdf \"$WORK_DIR\"
+cd \"$WORK_DIR\"/asdf
+make $2 l=clasp CLASP=$CLASP"))

src/lisp/kernel/cmp/compile-file-parallel.lisp

@@ -409,7 +409,7 @@ Compile a lisp source file into an LLVM module."
     ;; Don't enforce .bc extension for additional-bitcode-pathnames
     ;; This is where I used to link the additional-bitcode-pathnames
     (loop for part-llvm-ir in parts
-          for module = (llvm-sys:parse-irstring part-llvm-ir (thread-local-llvm-context))
+          for module = (llvm-sys:parse-irstring part-llvm-ir (thread-local-llvm-context) "")
           do (multiple-value-bind (failure error-msg)
                  (llvm-sys:link-modules link-module module)
                (when failure

src/lisp/kernel/lsp/loadltv.lisp

@@ -602,7 +602,7 @@ Tried to define constant #~d, but it was already defined"
 
 (defmethod %load-instruction ((mnemonic (eql 'init-object-array)) stream)
   (check-initialization *initflags*)
-  (let ((nobjs (read-ub64)))
+  (let ((nobjs (read-ub64 stream)))
     (dbgprint " (init-object-array ~d)" nobjs)
     (setf *index-bytes* (max 1 (ash 1 (1- (ceiling (integer-length nobjs) 8))))
           *constants* (make-array nobjs)