Fixed llvm ABI changes

Author: drmeister

src/lisp/kernel/cleavir/landing-pad.lisp

@@ -156,8 +156,10 @@
         (when cleanup-p (llvm-sys:set-cleanup lpad t))
         (cmp:irc-store exception-structure *exn.slot*)
         (cmp:irc-store exception-selector *ehselector.slot*)
-        (let* ((typeid (%intrinsic-call "llvm.eh.typeid.for"
-                                        (list (cmp:irc-exception-typeid* 'cmp:typeid-core-unwind))))
+        (let* ((typeid (%intrinsic-call
+                        #+(or llvm15 llvm16 llvm17)"llvm.eh.typeid.for"
+                        #-(or llvm15 llvm16 llvm17)"llvm.eh.typeid.for.p0"
+                        (list (cmp:irc-exception-typeid* 'cmp:typeid-core-unwind))))
                (matches-type (cmp:irc-icmp-eq exception-selector typeid)))
           ;; If the exception is Clasp's Unwind exception, we handle it.
           ;; Otherwise we go to the cleanup, or perhaps directly to the resume.
@@ -287,7 +289,10 @@
           (bb (cmp:irc-basic-block-create "escape-m-v-prog1")))
       (cmp:irc-begin-block bb)
       ;; Lose the saved values alloca.
-      (%intrinsic-call cmp:+llvm.stackrestore+ (list stackpos))
+      (%intrinsic-call
+       #+(or llvm15 llvm16 llvm17)"llvm.stackrestore"
+       #-(or llvm15 llvm16 llvm17)"llvm.stackrestore.p0"
+       (list stackpos))
       ;; Continue
       (cmp:irc-br
        (maybe-entry-processor (cleavir-bir:parent instruction) tags))
@@ -300,7 +305,10 @@
           (let ((bb (cmp:irc-basic-block-create "escape-m-v-prog1")))
             (cmp:irc-begin-block bb)
             ;; Lose the saved values alloca.
-            (%intrinsic-call cmp:+llvm.stackrestore+ (list stackpos))
+            (%intrinsic-call
+             #+(or llvm15 llvm16 llvm17)"llvm.stackrestore"
+             #-(or llvm15 llvm16 llvm17)"llvm.stackrestore.p0"
+             (list stackpos))
             ;; Continue
             (cmp:irc-br
              (maybe-entry-processor (cleavir-bir:parent inst) tags))

src/lisp/kernel/cleavir/translate.lisp

@@ -210,7 +210,10 @@
          (nvals (cmp:irc-tmv-nret tmv))
          (primary (cmp:irc-tmv-primary tmv))
          ;; NOTE: Must be done BEFORE the alloca*fea.
-         (save (%intrinsic-call cmp:+llvm.stacksave+ nil))
+         (save (%intrinsic-call
+                #+(or llvm15 llvm16 llvm17)"llvm.stacksave"
+                #-(or llvm15 llvm16 llvm17)"llvm.stacksave.p0"
+                nil))
          (mv-temp (cmp:alloca-temp-values nvals))
          (label (datum-name-as-string outp))
          (s2 (cmp::irc-make-vaslist nvals mv-temp label)))
@@ -232,12 +235,18 @@
       (%intrinsic-call "cc_set_dynenv_stack" (list old-de-stack)))))
 (defmethod undo-dynenv ((dynenv bir:values-save) tmv)
   (declare (ignore tmv))
-  (%intrinsic-call cmp:+llvm.stackrestore+ (list (dynenv-storage dynenv))))
+  (%intrinsic-call
+   #+(or llvm15 llvm16 llvm17)"llvm.stackrestore"
+   #-(or llvm15 llvm16 llvm17)"llvm.stackrestore.p0"
+   (list (dynenv-storage dynenv))))
 (defmethod undo-dynenv ((dynenv bir:values-collect) tmv)
   (declare (ignore tmv))
   (let ((storage (dynenv-storage dynenv)))
     (when storage
-      (%intrinsic-call cmp:+llvm.stackrestore+ (list storage)))))
+      (%intrinsic-call
+       #+(or llvm15 llvm16 llvm17)"llvm.stackrestore"
+       #-(or llvm15 llvm16 llvm17)"llvm.stackrestore.p0"
+       (list storage)))))
 
 (defun translate-local-unwind (jump tmv)
   (loop with target = (bir:dynamic-environment
@@ -1519,7 +1528,10 @@
                  for n = size then (cmp:irc-add n size "sum-nret")
                  collect n))
          (n-total-values (first (last partial-sums)))
-         (stacksave (%intrinsic-call cmp:+llvm.stacksave+ nil "values-collect"))
+         (stacksave (%intrinsic-call
+                     #+(or llvm15 llvm16 llvm17)"llvm.stacksave"
+                     #-(or llvm15 llvm16 llvm17)"llvm.stacksave.p0"
+                     nil "values-collect"))
          (tv-size
            ;; In order to store the primary value unconditionally below, we
            ;; need to allocate one extra word. This is important for the
@@ -1610,7 +1622,10 @@
                      in)
                     ((eq irt :multiple-values)
                      (let* ((nret (cmp:irc-tmv-nret in))
-                            (save (%intrinsic-call cmp:+llvm.stacksave+ nil))
+                            (save (%intrinsic-call
+                                   #+(or llvm15 llvm16 llvm17)"llvm.stacksave"
+                                   #-(or llvm15 llvm16 llvm17)"llvm.stacksave.p0"
+                                   nil))
                             (values (cmp:alloca-temp-values nret)))
                        (setf (dynenv-storage inst) save)
                        (%intrinsic-call "cc_save_values"

src/lisp/kernel/cmp/cmpexports.lisp

@@ -38,8 +38,6 @@
             xep-group-entry-point-reference
             xep-group-cleavir-lambda-list-analysis
             +c++-stamp-max+
-            +llvm.stacksave+
-            +llvm.stackrestore+
             %opaque-fn-prototype*%
             fn-prototype
             *cleavir-compile-file-hook*

src/lisp/kernel/cmp/primitives.lisp

@@ -1,13 +1,5 @@
 (in-package #:cmp)
 
-(defvar +llvm.stacksave+
-  #+(or llvm15 llvm16 llvm17)"llvm.stacksave"
-  #-(or llvm15 llvm16 llvm17)"llvm.stacksave.p0")
-
-(defvar +llvm.stackrestore+
-  #+(or llvm15 llvm16 llvm17)"llvm.stackrestore"
-  #-(or llvm15 llvm16 llvm17)"llvm.stackrestore.p0")
-
 (defstruct (primitive (:type vector) :named)
   return-type-name
   argument-type-names
@@ -132,7 +124,9 @@
          (primitive         "__gxx_personality_v0" :i32 nil :varargs t)
          (primitive         "__cxa_begin_catch" :i8* (list :i8*) )
          (primitive-unwinds "__cxa_end_catch" :void nil)
-         (primitive         "llvm.eh.typeid.for" :i32 (list :i8*))
+         (primitive #+(or llvm15 llvm16 llvm17)"llvm.eh.typeid.for"
+          #-(or llvm15 llvm16 llvm17)"llvm.eh.typeid.for.p0"
+          :i32 (list :i8*))
          (primitive-unwinds "cc_overflowed_signed_bignum" :t* (list :i64))
          (primitive         "llvm.sadd.with.overflow.i32" :{i32.i1} (list :i32 :i32))
          (primitive         "llvm.sadd.with.overflow.i64" :{i64.i1} (list :i64 :i64))
@@ -196,8 +190,14 @@
          (primitive         "llvm.lifetime.start" :void (list :i64 :i8*))
          (primitive         "llvm.lifetime.end" :void (list :i64 :i8*))
 
-         (primitive         +llvm.stacksave+ :i8* nil)
-         (primitive         +llvm.stackrestore+ :void (list :i8*))
+         (primitive
+          #+(or llvm15 llvm16 llvm17)"llvm.stacksave"
+          #-(or llvm15 llvm16 llvm17)"llvm.stacksave.p0"
+          :i8* nil)
+         (primitive
+          #+(or llvm15 llvm16 llvm17)"llvm.stackrestore"
+          #-(or llvm15 llvm16 llvm17)"llvm.stackrestore.p0"
+          :void (list :i8*))
 
          (primitive         "llvm.memcpy.p0.p0.i64" :void (list :i8* :i8* :i64 :i1))
          (primitive         "llvm.memmove.p0.p0.i64" :void (list :i8* :i8* :i64 :i1))