Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop using "Hack to avoid function merging" #129438

Closed
scottmcm opened this issue Aug 23, 2024 · 2 comments · Fixed by #129468
Closed

Stop using "Hack to avoid function merging" #129438

scottmcm opened this issue Aug 23, 2024 · 2 comments · Fixed by #129468
Assignees
@rustbot
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc C-cleanup Category: PRs that clean code up or issues documenting cleanup. E-easy Call for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Comments

@scottmcm
Copy link
Member

scottmcm commented Aug 23, 2024 •
edited by rustbot
Loading

There's a whole bunch of this:

tests\assembly\asm\x86-types.rs
125:            // Hack to avoid function merging
142:            // Hack to avoid function merging

tests\assembly\asm\x86-modifiers.rs
41:            // Hack to avoid function merging

tests\assembly\asm\s390x-types.rs
45:// Hack to avoid function merging

tests\assembly\asm\riscv-types.rs
93:            // Hack to avoid function merging
110:            // Hack to avoid function merging

tests\assembly\asm\powerpc-types.rs
46:// Hack to avoid function merging

tests\assembly\asm\mips-types.rs
46:// Hack to avoid function merging

tests\assembly\asm\loongarch-type.rs
42:// Hack to avoid function merging

tests\assembly\asm\hexagon-types.rs
44:            // Hack to avoid function merging
61:            // Hack to avoid function merging
80:    // Hack to avoid function merging
95:    // Hack to avoid function merging

tests\assembly\asm\arm-types.rs
120:            // Hack to avoid function merging
137:            // Hack to avoid function merging

tests\assembly\asm\arm-modifiers.rs
46:            // Hack to avoid function merging

tests\assembly\asm\aarch64-types.rs
119:            // Hack to avoid function merging
140:            // Hack to avoid function merging

tests\assembly\asm\aarch64-modifiers.rs
32:            // Hack to avoid function merging

Do we really need to hack it, though? We have a flag for that:

//@ compile-flags: -Zmerge-functions=disabled

This issue has been assigned to @Rajveer100 via this comment.
@rustbot rustbot added the needs-triage This issue may need triage. Remove it if it has been sufficiently triaged. label Aug 23, 2024
@jieyouxu jieyouxu added C-cleanup Category: PRs that clean code up or issues documenting cleanup. A-testsuite Area: The testsuite used to check the correctness of rustc T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. and removed needs-triage This issue may need triage. Remove it if it has been sufficiently triaged. labels Aug 23, 2024
@scottmcm scottmcm added the E-easy Call for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue. label Aug 23, 2024
Rajveer100 added a commit to Rajveer100/rust that referenced this issue Aug 23, 2024
@Rajveer100
[testsuite][cleanup] Remove all usages of dont_merge hack to avoid …
ca502db 
…function merging

Resolves rust-lang#129438

The `-Zmerge-functions=disabled` compile flag exists for this purpose.
@Rajveer100 Rajveer100 mentioned this issue Aug 23, 2024
Merged
Rajveer100 added a commit to Rajveer100/rust that referenced this issue Aug 23, 2024
@Rajveer100
[testsuite][cleanup] Remove all usages of dont_merge hack to avoid …
7453128 
…function merging

Resolves rust-lang#129438

The `-Zmerge-functions=disabled` compile flag exists for this purpose.
@saksham-agarwal-dev
Copy link

@rustbot claim

@jieyouxu
Copy link
Member

jieyouxu commented Aug 30, 2024 •
edited
Loading

@saksham-agarwal-dev Hi, thanks for your interest. However, I believe @Rajveer100 already has an open PR (#129468) trying to address this.

@rustbot assign @Rajveer100

Rajveer100 added a commit to Rajveer100/rust that referenced this issue Aug 30, 2024
@Rajveer100
[testsuite][cleanup] Remove all usages of dont_merge hack to avoid …
8575a93 
…function merging

Resolves rust-lang#129438

The `-Zmerge-functions=disabled` compile flag exists for this purpose.
Rajveer100 added a commit to Rajveer100/rust that referenced this issue Aug 30, 2024
@Rajveer100
[testsuite][cleanup] Remove all usages of dont_merge hack to avoid …
25b4cbd 
…function merging

Resolves rust-lang#129438

The `-Zmerge-functions=disabled` compile flag exists for this purpose.
Rajveer100 added a commit to Rajveer100/rust that referenced this issue Aug 30, 2024
@Rajveer100
[testsuite][cleanup] Remove all usages of dont_merge hack to avoid …
dd2a955 
…function merging

Resolves rust-lang#129438

The `-Zmerge-functions=disabled` compile flag exists for this purpose.
Rajveer100 added a commit to Rajveer100/rust that referenced this issue Aug 30, 2024
@Rajveer100
[testsuite][cleanup] Remove all usages of dont_merge hack to avoid …
800a1ce 
…function merging

Resolves rust-lang#129438

The `-Zmerge-functions=disabled` compile flag exists for this purpose.
compiler-errors added a commit to compiler-errors/rust that referenced this issue Sep 7, 2024
@compiler-errors
Rollup merge of rust-lang#129468 - Rajveer100:hack-to-avoid-function-…
adcee23 
…merging, r=Mark-Simulacrum

[testsuite][cleanup] Remove all usages of `dont_merge` hack to avoid function merging

Resolves rust-lang#129438

The `-Zmerge-functions=disabled` compile flag exists for this purpose.
@bors bors closed this as completed in b324fcb Sep 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this issue Sep 7, 2024
@rust-timer
Unrolled build for rust-lang#129468
b247985 
Rollup merge of rust-lang#129468 - Rajveer100:hack-to-avoid-function-merging, r=Mark-Simulacrum

[testsuite][cleanup] Remove all usages of `dont_merge` hack to avoid function merging

Resolves rust-lang#129438

The `-Zmerge-functions=disabled` compile flag exists for this purpose.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@rustbot rustbot

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc C-cleanup Category: PRs that clean code up or issues documenting cleanup. E-easy Call for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

[testsuite][cleanup] Remove all usages of dont_merge hack to avoid function merging Rajveer100/rust
4 participants
@scottmcm @jieyouxu @rustbot @saksham-agarwal-dev