Cherry-pick "[M68k] Fix ODR violation in GISel code (#72797)" - #159
Merged
cuviper merged 1 commit intoDec 19, 2023
Merged
Conversation
It prevents LLVM from being linked with LLD at least on Windows, with errors like this:
```
= note: ld.lld: error: duplicate symbol: vtable for llvm::FormalArgHandler
>>> defined at librustc_llvm-a81737dd65a7c126.rlib(M68kCallLowering.cpp.obj)
>>> defined at librustc_llvm-a81737dd65a7c126.rlib(PPCCallLowering.cpp.obj)
```
Binutils linker also complains about this, but only with warnings.
`FormalArgHandler` has a base class `M68kIncomingValueHandler` which doesn't have a virtual method `markPhysRegUsed` like `IncomingValueHandler`s for all other targets including PPC, so it results in a conflict.
The simplest fix is to rename the `FormalArgHandler` structure (rather than to adding virtual methods for compatibility).
Author
|
Not sure what is the expected process for such cherry-picking and updating LLVM in rust-lang/rust. |
Member
|
You're within the correct process: Next will be a PR with the submodule update in the rust repo. |
petrochenkov
added a commit
to petrochenkov/rust
that referenced
this pull request
Dec 20, 2023
to pick up "[M68k] Fix ODR violation in GISel code (rust-lang#72797)" rust-lang/llvm-project#159
nikic
reviewed
Dec 20, 2023
|
|
||
| private: | ||
| void assignValueToReg(Register ValVReg, Register PhysReg, | ||
| const CCValAssign &VA) override; |
There was a problem hiding this comment.
This needs to be CCValAssign VA for LLVM 17. This causes the build failure in rust-lang/rust#119159.
petrochenkov
added a commit
to petrochenkov/rust
that referenced
this pull request
Dec 20, 2023
to pick up "[M68k] Fix ODR violation in GISel code (rust-lang#72797)" rust-lang/llvm-project#159
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Dec 20, 2023
Update LLVM submodule to pick up "[M68k] Fix ODR violation in GISel code (rust-lang#72797)" rust-lang/llvm-project#159. Fixes rust-lang#107668
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 20, 2023
Rollup merge of rust-lang#119159 - petrochenkov:llvmup, r=nikic Update LLVM submodule to pick up "[M68k] Fix ODR violation in GISel code (rust-lang#72797)" rust-lang/llvm-project#159. Fixes rust-lang#107668
vext01
pushed a commit
to vext01/llvm-project
that referenced
this pull request
May 17, 2024
Reject a bunch of call variants that we haven't considered yet.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
llvm@8cb8428
To get
download-ci-llvmto work sooner (rust-lang/rust#107668).