diff options
| author | bors <bors@rust-lang.org> | 2023-05-13 05:52:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-13 05:52:50 +0000 |
| commit | 69fef92ab2f287f072b66fb7b4f62c8bb4acba43 (patch) | |
| tree | 9c35e104a85958c2e5779572d67da3406f61a5b2 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | 16d3e18281fde75eb6c62ebb8363af28de8a3ef0 (diff) | |
| parent | 1533eafa15942f9e66a28a19baa492b2ce6126c4 (diff) | |
| download | rust-69fef92ab2f287f072b66fb7b4f62c8bb4acba43.tar.gz rust-69fef92ab2f287f072b66fb7b4f62c8bb4acba43.zip | |
Auto merge of #111526 - Dylan-DPC:rollup-h75agro, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #110454 (Require impl Trait in associated types to appear in method signatures) - #111096 (Add support for `cfg(overflow_checks)`) - #111451 (Note user-facing types of coercion failure) - #111469 (Fix data race in llvm source code coverage) - #111494 (Encode `VariantIdx` so we can decode ADT variants in the right order) - #111499 (asm: loongarch64: Drop efiapi) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 5ec3b95225d..7b774d6865c 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -745,6 +745,9 @@ LLVMRustOptimize( if (InstrProfileOutput) { Options.InstrProfileOutput = InstrProfileOutput; } + // cargo run tests in multhreading mode by default + // so use atomics for coverage counters + Options.Atomic = true; MPM.addPass(InstrProfiling(Options, false)); } ); |