From e7c4b128a5fb5fd928133a5a9518bf7e6af8be34 Mon Sep 17 00:00:00 2001
From: Sebastian Poeplau <poeplau@adacore.com>
Date: Mon, 12 May 2025 10:49:25 +0200
Subject: [PATCH 1/2] Fix handling of the llvm.eh.typeid.for intrinsic

We use IntrinsicLowering to turn a number of supported intrinsics into
code or library calls that we can instrument. This transformation is
expected to preserve code semantics. However, IntrinsicLowering handles
llvm.eh.typeid.for by inserting a dummy value of constant 1, which
changes code semantics in many cases (except when 1 happens to be the
expected type ID).

This commit makes the compiler stop using IntrinsicLowering for
llvm.eh.typeid.for; instead, we treat the intrinsic's result as a
constant.

Fixes eng/das/fuzz/symcc#23.
---
 compiler/Pass.cpp       | 1 -
 compiler/Symbolizer.cpp | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/Pass.cpp b/compiler/Pass.cpp
index af0d88a8..78c52ae2 100644
--- a/compiler/Pass.cpp
+++ b/compiler/Pass.cpp
@@ -85,7 +85,6 @@ bool canLower(const CallInst *CI) {
   case Intrinsic::pcmarker:
   case Intrinsic::dbg_declare:
   case Intrinsic::dbg_label:
-  case Intrinsic::eh_typeid_for:
   case Intrinsic::annotation:
   case Intrinsic::ptr_annotation:
   case Intrinsic::assume:
diff --git a/compiler/Symbolizer.cpp b/compiler/Symbolizer.cpp
index 41ad7ba8..fc9053ed 100644
--- a/compiler/Symbolizer.cpp
+++ b/compiler/Symbolizer.cpp
@@ -338,6 +338,9 @@ void Symbolizer::handleIntrinsicCall(CallBase &I) {
     break;
   }
 #endif
+  case Intrinsic::eh_typeid_for:
+    // This intrinsic returns a constant for our purposes.
+    break;
   default:
     errs() << "Warning: unhandled LLVM intrinsic " << callee->getName()
            << "; the result will be concretized\n";

From 926172bf415eb64adcd22286c7698d6bba04e20c Mon Sep 17 00:00:00 2001
From: Sebastian Poeplau <poeplau@adacore.com>
Date: Mon, 12 May 2025 10:56:24 +0200
Subject: [PATCH 2/2] Use a more recent Ubuntu for CI

---
 .github/workflows/run_tests.yml | 81 +++++++++++++++++----------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 8e06e447..a0c46d80 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -3,7 +3,7 @@ on: [pull_request, workflow_dispatch]
 jobs:
   # Building and running the tests with Dockerfile
   build_and_test_symcc:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Setup docker compilation environment
@@ -19,10 +19,10 @@ jobs:
 
   # checking compatibility with ubuntu llvm packages
   llvm_compatibility:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-        llvm_version: [11, 12, 13, 14, 15]
+        llvm_version: [15, 16, 17, 18, 19]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -48,39 +48,42 @@ jobs:
             ..
           make
 
-  # checking compatibility (compilation only) with more recent packages
-  llvm_compatibility_latest_llvm:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        llvm_version: [16, 17, 18]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Add LLVM project deb repository
-        uses: myci-actions/add-deb-repo@11
-        with:
-          repo: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${{ matrix.llvm_version }} main
-          repo-name: llvm
-          update: false
-          keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            llvm-${{ matrix.llvm_version }}-dev \
-            libz3-dev \
-            git
-      - name: Build SymCC with the QSYM backend
-        run: |
-          git submodule update --init --recursive runtime
-          mkdir build
-          cd build
-          cmake \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DZ3_TRUST_SYSTEM_VERSION=ON \
-            -DSYMCC_RT_BACKEND=qsym \
-            -DLLVM_DIR=/usr/lib/llvm-${{ matrix.llvm_version }}/cmake \
-            ..
-          make
+  # TODO Re-enable the section below when LLVM releases a version that isn't
+  # supported by Ubuntu packages in our runner image.
+
+  # # checking compatibility (compilation only) with more recent packages
+  # llvm_compatibility_latest_llvm:
+  #   runs-on: ubuntu-22.04
+  #   strategy:
+  #     matrix:
+  #       llvm_version: [16, 17, 18]
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #       with:
+  #         submodules: true
+  #     - name: Add LLVM project deb repository
+  #       uses: myci-actions/add-deb-repo@11
+  #       with:
+  #         repo: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${{ matrix.llvm_version }} main
+  #         repo-name: llvm
+  #         update: false
+  #         keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
+  #     - name: Install dependencies
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y \
+  #           llvm-${{ matrix.llvm_version }}-dev \
+  #           libz3-dev \
+  #           git
+  #     - name: Build SymCC with the QSYM backend
+  #       run: |
+  #         git submodule update --init --recursive runtime
+  #         mkdir build
+  #         cd build
+  #         cmake \
+  #           -DCMAKE_BUILD_TYPE=Release \
+  #           -DZ3_TRUST_SYSTEM_VERSION=ON \
+  #           -DSYMCC_RT_BACKEND=qsym \
+  #           -DLLVM_DIR=/usr/lib/llvm-${{ matrix.llvm_version }}/cmake \
+  #           ..
+  #         make