llvm: replace some deprecated functions #130389

Luv-Ray · 2024-09-15T09:09:50Z

LLVMMDStringInContext and LLVMMDNodeInContext are deprecated, replace them with LLVMMDStringInContext2 and LLVMMDNodeInContext2.
Also replace Value with Metadata in some function signatures for better consistency.

rustbot · 2024-09-15T09:09:58Z

r? @wesleywiser

rustbot has assigned @wesleywiser.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-09-15T09:57:43Z

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

bors · 2024-09-18T21:35:40Z

☔ The latest upstream changes (presumably #130519) made this pull request unmergeable. Please resolve the merge conflicts.

nnethercote · 2024-09-18T23:22:11Z

I unintentionally duplicated this effort in #130503. My PR looked extremley similar to this one, although I didn't add Metadata to BackendTypes. Anyway, looks good to me.

r? @nikic

nikic · 2024-09-19T07:45:56Z

compiler/rustc_codegen_llvm/src/builder.rs

-            );
+            let md = llvm::LLVMMDNodeInContext2(self.cx.llcx, v.as_ptr(), v.len());
+            let md = llvm::LLVMMetadataAsValue(&self.llcx, md);
+            llvm::LLVMSetMetadata(load, llvm::MD_range as c_uint, md);


Can we add a set_metadata method that does the LLVMMetadataAsValue + LLVMSetMetadata dance?

LLVM should really allow setting the metadata without first wrapping it in a value and then unwrapping again, but we can at least hide this...

nikic · 2024-09-19T10:48:22Z

compiler/rustc_codegen_llvm/src/context.rs

@@ -586,6 +586,14 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
            llvm::LLVMSetSection(g, c"llvm.metadata".as_ptr());
        }
    }
+
+    /// A wrapper for [`llvm::LLVMSetMetadata`], but it takes `Metadata` as a parameter instead of `Value`.
+    pub(crate) fn set_metadata<'a>(&self, val: &'a Value, kind_id: c_uint, md: &'a Metadata) {


Accept MetadataType here and move the c_uint cast into the method?

nikic · 2024-09-19T12:38:11Z

@bors r+ rollup

bors · 2024-09-19T12:38:13Z

📌 Commit 6da2d6e has been approved by nikic

It is now in the queue for this repository.

bors · 2024-09-19T12:49:55Z

⌛ Testing commit 6da2d6e with merge dede102...

llvm: replace some deprecated functions `LLVMMDStringInContext` and `LLVMMDNodeInContext` are deprecated, replace them with `LLVMMDStringInContext2` and `LLVMMDNodeInContext2`. Also replace `Value` with `Metadata` in some function signatures for better consistency.

bors · 2024-09-19T13:11:51Z

💔 Test failed - checks-actions

Luv-Ray · 2024-09-19T15:16:07Z

I can't reproduce the error with ./x.py --stage 1 test tests/codegen/issues/issue-111508-vec-tryinto-array.rs on my local machine...

nikic · 2024-09-20T15:10:01Z

Ah crap, I didn't realize that bors retry also retires try builds. I'll just let it run to avoid confusing bors further.

bors · 2024-09-20T15:30:29Z

💔 Test failed - checks-actions

nikic · 2024-09-20T19:55:11Z

Huh, and now it failed again. So probably something is legitimately wrong with this patch that makes things break non-deterministically -- but I'm not able to spot it.

nikic · 2024-09-21T07:56:53Z

Okay, this test has been failing on some other PRs as well, I filed #130656.

nikic · 2024-09-23T07:17:48Z

Problematic test has been removed, try again...

@bors r+

bors · 2024-09-23T07:17:50Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: std: implement the random feature (alternative version) #129201

bors · 2024-09-23T07:17:51Z

📌 Commit 6da2d6e has been approved by nikic

It is now in the queue for this repository.

Luv-Ray · 2024-09-23T08:28:37Z

seems that it needs to run retry

llvm: replace some deprecated functions `LLVMMDStringInContext` and `LLVMMDNodeInContext` are deprecated, replace them with `LLVMMDStringInContext2` and `LLVMMDNodeInContext2`. Also replace `Value` with `Metadata` in some function signatures for better consistency.

workingjubilee · 2024-09-24T08:07:42Z

@bors r=nikic

bors · 2024-09-24T08:07:46Z

📌 Commit d7ebf9e has been approved by nikic

It is now in the queue for this repository.

bors · 2024-09-24T12:07:52Z

⌛ Testing commit d7ebf9e with merge 4cbfcf1...

bors · 2024-09-24T14:51:00Z

☀️ Test successful - checks-actions
Approved by: nikic
Pushing 4cbfcf1 to master...

rust-timer · 2024-09-24T16:08:17Z

Finished benchmarking commit (4cbfcf1): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -3.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	[-3.0%, -3.0%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (primary 1.8%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.8%	[1.8%, 1.8%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.8%	[1.8%, 1.8%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 770.84s -> 769.56s (-0.17%)
Artifact size: 340.88 MiB -> 340.89 MiB (0.00%)

llvm: replace some deprecated functions `LLVMMDStringInContext` and `LLVMMDNodeInContext` are deprecated, replace them with `LLVMMDStringInContext2` and `LLVMMDNodeInContext2`. Also replace `Value` with `Metadata` in some function signatures for better consistency.

rustbot assigned wesleywiser Sep 15, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 15, 2024

This comment has been minimized.

Sign in to view

bjorn3 reviewed Sep 15, 2024

View reviewed changes

compiler/rustc_codegen_llvm/src/llvm/ffi.rs Outdated Show resolved Hide resolved

klensy mentioned this pull request Sep 18, 2024

Remove LLVMMD{String,Node}InContext #130503

Closed

rustbot assigned nikic and unassigned wesleywiser Sep 18, 2024

replace some deprecated functions

b7c5656

Luv-Ray force-pushed the LLVMMDNodeInContext2 branch from 475d65c to b7c5656 Compare September 19, 2024 01:39

nikic reviewed Sep 19, 2024

View reviewed changes

wrap LLVMSetMetadata

632342a

nikic reviewed Sep 19, 2024

View reviewed changes

Luv-Ray added 2 commits September 19, 2024 18:52

move place

e2ec83c

MetadataType type cast

6da2d6e

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 19, 2024

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 19, 2024

This comment has been minimized.

Sign in to view

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 20, 2024

This was referenced Sep 21, 2024

issue-111508-vec-tryinto-array.rs fails spuriously on x86_64-gnu-llvm-19 #130656

Closed

Update to LLVM 19.1.0 #130641

Merged

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 23, 2024

workingjubilee mentioned this pull request Sep 23, 2024

Rollup of 8 pull requests #130753

Closed

workingjubilee closed this Sep 23, 2024

workingjubilee reopened this Sep 23, 2024

This comment has been minimized.

Sign in to view

format

d7ebf9e

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 24, 2024

bors merged commit 4cbfcf1 into rust-lang:master Sep 24, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Sep 24, 2024

llvm: replace some deprecated functions #130389

llvm: replace some deprecated functions #130389

Uh oh!

Conversation

Luv-Ray commented Sep 15, 2024 • edited by nikic Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 15, 2024

Uh oh!

This comment has been minimized.

rustbot commented Sep 15, 2024

Uh oh!

Uh oh!

bors commented Sep 18, 2024

Uh oh!

nnethercote commented Sep 18, 2024

Uh oh!

nikic Sep 19, 2024

Choose a reason for hiding this comment

Uh oh!

nikic Sep 19, 2024

Choose a reason for hiding this comment

Uh oh!

Luv-Ray Sep 19, 2024

Choose a reason for hiding this comment

Uh oh!

nikic commented Sep 19, 2024

Uh oh!

bors commented Sep 19, 2024

Uh oh!

bors commented Sep 19, 2024

Uh oh!

This comment has been minimized.

bors commented Sep 19, 2024

Uh oh!

Luv-Ray commented Sep 19, 2024

Uh oh!

nikic commented Sep 20, 2024

Uh oh!

This comment has been minimized.

bors commented Sep 20, 2024

Uh oh!

nikic commented Sep 20, 2024

Uh oh!

nikic commented Sep 21, 2024

Uh oh!

nikic commented Sep 23, 2024

Uh oh!

bors commented Sep 23, 2024

Uh oh!

bors commented Sep 23, 2024

Uh oh!

Luv-Ray commented Sep 23, 2024

Uh oh!

This comment has been minimized.

workingjubilee commented Sep 24, 2024

Uh oh!

bors commented Sep 24, 2024

Uh oh!

bors commented Sep 24, 2024

Uh oh!

bors commented Sep 24, 2024

Uh oh!

Uh oh!

rust-timer commented Sep 24, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Luv-Ray commented Sep 15, 2024 •

edited by nikic

Loading