Skip to content

Commit 624fb23

Browse files
committed
1 parent de654ec commit 624fb23

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

.github/workflows/build-and-test-template.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ jobs:
149149
git fetch
150150
git switch llvm-19
151151
git apply $GITHUB_WORKSPACE/julia-patches/adapt_to_102993.patch
152+
git apply $GITHUB_WORKSPACE/julia-patches/adapt_to_100310.patch
152153
mkdir -p deps/srccache
153154
mv ../LLVM_full_assert.v${LLVM_VERSION_MAJOR}.0.0.${{ inputs.target }}.tar.gz deps/srccache/libLLVM.v18.1.7+2.${{ inputs.target }}.tar.gz
154155
make -j4 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl

julia-patches/adapt_to_100310.patch

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff --git a/src/codegen.cpp b/src/codegen.cpp
2+
index 9184e4895a..02f91f705f 100644
3+
--- a/src/codegen.cpp
4+
+++ b/src/codegen.cpp
5+
@@ -79,6 +79,7 @@
6+
#include "llvm/Support/Path.h" // for llvm::sys::path
7+
#include <llvm/Bitcode/BitcodeReader.h>
8+
#include <llvm/Linker/Linker.h>
9+
+#include <llvm/CodeGen/MachineModuleInfo.h>
10+
11+
using namespace llvm;
12+
13+
@@ -10350,15 +10351,17 @@ namespace llvm {
14+
class MachineBasicBlock;
15+
class MachineFunction;
16+
raw_ostream& operator<<(raw_ostream &OS, const MachineBasicBlock &MBB);
17+
- void printMIR(raw_ostream &OS, const MachineFunction &MF);
18+
+ void printMIR(raw_ostream &OS, const MachineModuleInfo &MMI,
19+
+ const MachineFunction &MF);
20+
}
21+
extern "C" void jl_dump_llvm_mbb(void *v)
22+
{
23+
errs() << *(llvm::MachineBasicBlock*)v;
24+
}
25+
-extern "C" void jl_dump_llvm_mfunction(void *v)
26+
+extern "C" void jl_dump_llvm_mfunction(void *m, void *v)
27+
{
28+
- llvm::printMIR(errs(), *(llvm::MachineFunction*)v);
29+
+ llvm::printMIR(errs(), *(llvm::MachineModuleInfo*)v,
30+
+ *(llvm::MachineFunction*)v);
31+
}
32+
33+

0 commit comments

Comments
 (0)