8570490240
Migrated to SPDX license Related: RHEL-12966
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 6fce2a3e054185fb85d5a55a9e5a35d41a2c492e Mon Sep 17 00:00:00 2001
|
|
From: Krasimir Georgiev <krasimir@google.com>
|
|
Date: Wed, 12 Jul 2023 09:30:31 +0000
|
|
Subject: [PATCH 1/2] llvm-wrapper: adapt for LLVM API change
|
|
|
|
Adapts the wrapper for LLVM commit
|
|
https://github.com/llvm/llvm-project/commit/546ec641b4b1bbbf9e66a53983b635fe85d365e6.
|
|
|
|
Found by the experimental rust + LLVM @ HEAD bot: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/20723#01894922-ed5d-4830-81f6-a27fb82ec8c7/210-645
|
|
|
|
(cherry picked from commit 71958da4854176c50a8b12470b956d5c7ed11817)
|
|
---
|
|
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
|
|
index c43a02724773..eb3d67e720f2 100644
|
|
--- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
|
|
+++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
|
|
@@ -667,6 +667,7 @@ LLVMRustOptimize(
|
|
assert(!PGOUsePath && !PGOSampleUsePath);
|
|
PGOOpt = PGOOptions(PGOGenPath, "", "",
|
|
#if LLVM_VERSION_GE(17, 0)
|
|
+ "",
|
|
FS,
|
|
#endif
|
|
PGOOptions::IRInstr, PGOOptions::NoCSAction,
|
|
@@ -675,6 +676,7 @@ LLVMRustOptimize(
|
|
assert(!PGOSampleUsePath);
|
|
PGOOpt = PGOOptions(PGOUsePath, "", "",
|
|
#if LLVM_VERSION_GE(17, 0)
|
|
+ "",
|
|
FS,
|
|
#endif
|
|
PGOOptions::IRUse, PGOOptions::NoCSAction,
|
|
@@ -682,6 +684,7 @@ LLVMRustOptimize(
|
|
} else if (PGOSampleUsePath) {
|
|
PGOOpt = PGOOptions(PGOSampleUsePath, "", "",
|
|
#if LLVM_VERSION_GE(17, 0)
|
|
+ "",
|
|
FS,
|
|
#endif
|
|
PGOOptions::SampleUse, PGOOptions::NoCSAction,
|
|
@@ -689,6 +692,7 @@ LLVMRustOptimize(
|
|
} else if (DebugInfoForProfiling) {
|
|
PGOOpt = PGOOptions("", "", "",
|
|
#if LLVM_VERSION_GE(17, 0)
|
|
+ "",
|
|
FS,
|
|
#endif
|
|
PGOOptions::NoAction, PGOOptions::NoCSAction,
|
|
--
|
|
2.41.0
|
|
|