Don't include global asm in mir_keys, fix error body synthesis by compiler-errors · Pull Request #137502 · rust-lang/rust (original) (raw)

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.

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

Already on GitHub?Sign in to your account

Conversation55 Commits3 Checks6 Files changed

Conversation

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

[ Show hidden characters]({{ revealButtonHref }})

compiler-errors

@rustbot 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

Feb 23, 2025

@rustbot

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

oli-obk

oli-obk

@compiler-errors

@bors

📌 Commit f68ff69 has been approved by oli-obk

It is now in the queue for this repository.

@bors 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

Feb 25, 2025

fmease added a commit to fmease/rust that referenced this pull request

Feb 26, 2025

@fmease

bors added a commit to rust-lang-ci/rust that referenced this pull request

Feb 26, 2025

@bors

@fmease

tests/ui/asm/global-asm-isnt-really-a-mir-body.rs#instrument failed on aarch64-apple in rollup #137649 with:

---- [ui] tests/ui/asm/global-asm-isnt-really-a-mir-body.rs#instrument stdout ----
error in revision `instrument`: test compilation failed although it shouldn't!
status: exit status: 1
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/bin/rustc" "/Users/runner/work/rust/rust/tests/ui/asm/global-asm-isnt-really-a-mir-body.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/.cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/work/rust/rust/vendor" "--sysroot" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2" "--target=aarch64-apple-darwin" "--cfg" "instrument" "--check-cfg" "cfg(test,FALSE,emit_mir,instrument,cfi)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/asm/global-asm-isnt-really-a-mir-body.instrument" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/native/rust-test-helpers" "-Cinstrument-coverage" "-Zno-profiler-runtime"
--- stderr -------------------------------
error: linking with `cc` failed: exit status: 1
   |
   |
   = note:  "cc" "/var/folders/2s/h6hvv9ps03xgz_krkkstvq_r0000gn/T/rustchOsAJj/symbols.o" "<1 object files omitted>" "<sysroot>/lib/rustlib/aarch64-apple-darwin/lib/libstd-d16fc3ab99251824.dylib" "<sysroot>/lib/rustlib/aarch64-apple-darwin/lib/{libcompiler_builtins-*}.rlib" "-lSystem" "-lc" "-lm" "-arch" "arm64" "-mmacosx-version-min=11.0.0" "-L" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/native/rust-test-helpers" "-o" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/asm/global-asm-isnt-really-a-mir-body.instrument/global-asm-isnt-really-a-mir-body" "-Wl,-dead_strip" "-nodefaultlibs" "-Wl,-rpath,@loader_path/../../../../stage2/lib/rustlib/aarch64-apple-darwin/lib"
   = note: Undefined symbols for architecture arm64:
   = note: Undefined symbols for architecture arm64:
             "___llvm_profile_raw_version", referenced from:
           ld: symbol(s) not found for architecture arm64
           ld: symbol(s) not found for architecture arm64
           clang: error: linker command failed with exit code 1 (use -v to see invocation)

error: aborting due to 1 previous error
------------------------------------------

#137649 (comment)

@bors r-

@bors 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-bors

Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

labels

Feb 26, 2025

@fmease

bors added a commit to rust-lang-ci/rust that referenced this pull request

Feb 26, 2025

@bors

@bors

@rust-log-analyzer

This comment has been minimized.

@bors

@compiler-errors

bors added a commit to rust-lang-ci/rust that referenced this pull request

Mar 4, 2025

@bors

@bors

@bors

☀️ Try build successful - checks-actions
Build commit: 941dad3 (941dad302e3a02bb8d9d37593d97435f52fbbe62)

@compiler-errors

@bors

📌 Commit dc9d559 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-author

Status: This is awaiting some action (such as code changes or more information) from the author.

label

Mar 4, 2025

@bors

@compiler-errors

@compiler-errors

@compiler-errors

@bors

bors added a commit to rust-lang-ci/rust that referenced this pull request

Mar 6, 2025

@bors

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors

@compiler-errors

Poorly written test is matching a hash ending with "f" lmao

@compiler-errors

@compiler-errors

bors added a commit to rust-lang-ci/rust that referenced this pull request

Mar 7, 2025

@bors

@bors

@bors

☀️ Try build successful - checks-actions
Build commit: 2ffe366 (2ffe366b2f4e59ac2d645743b460575bf86bb0dc)

@compiler-errors

@bors r=oli-obk rollup=iffy

@bors

📌 Commit 5339d4e has been approved by oli-obk

It is now in the queue for this repository.

@bors 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

Mar 7, 2025

@bors

@bors

@rust-log-analyzer

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


gh pr comment ${HEAD_PR} -F output.log
shell: /usr/bin/bash -e {0}
##[endgroup]
fatal: ambiguous argument 'HEAD^1': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
##[error]Process completed with exit code 128.

@rust-timer

Finished benchmarking commit (dea1661): 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 -2.3%)

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) -2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) - - 0

Cycles

Results (secondary -0.2%)

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) 1.8% [1.8%, 1.8%] 1
Improvements ✅ (primary) - - 0
Improvements ✅ (secondary) -2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 765.938s -> 765.603s (-0.04%)
Artifact size: 362.04 MiB -> 361.95 MiB (-0.02%)

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Mar 10, 2025

@matthiaskrgr

…g, r=oli-obk

Pass InferCtxt to InlineAsmCtxt to properly taint on error

Pass an InferCtxt into the InlineAsmCtxt so that we can use the right dcx to taint the infcx properly, so that we don't try to build invalid MIR for inline asm blocks.

Fixes rust-lang#138130

Shares the first commit with rust-lang#137502.

r? oli-obk

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request

Mar 10, 2025

@rust-timer

Rollup merge of rust-lang#138138 - compiler-errors:inline-asm-tainting, r=oli-obk

Pass InferCtxt to InlineAsmCtxt to properly taint on error

Pass an InferCtxt into the InlineAsmCtxt so that we can use the right dcx to taint the infcx properly, so that we don't try to build invalid MIR for inline asm blocks.

Fixes rust-lang#138130

Shares the first commit with rust-lang#137502.

r? oli-obk

Labels

merged-by-bors

This PR was explicitly merged by bors.

S-waiting-on-bors

Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

T-compiler

Relevant to the compiler team, which will review and decide on the PR/issue.