Skip to content

Rollup of 9 pull requests #90590

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

Closed
matthiaskrgr wants to merge 21 commits into from
Closed

Rollup of 9 pull requests #90590

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fdb6bda
Add note about x86 instruction prefixes in asm!
syvb Nov 3, 2021
3f496b5
Simplify js tester a bit
GuillaumeGomez Nov 3, 2021
9057936
Demote metadata load warning to "info".
ehuss Nov 3, 2021
754455e
Clean up some `-Z unstable-options` in tests.
ehuss Nov 4, 2021
dc2c260
Add more text and examples to `carrying_{add|mul}"
scottmcm Nov 4, 2021
056af9d
rustbot: Allow applying relnotes label
joshtriplett Nov 4, 2021
7e02934
rustbot: Allow applying needs-fcp label
joshtriplett Nov 4, 2021
773cc4f
Mention possible future rejections
syvb Nov 4, 2021
aa17e1c
Fix missing bottom border for headings in sidebar
GuillaumeGomez Nov 4, 2021
3ad6d12
Sort scraped call locations before serializing
willcrichton Nov 4, 2021
4846d10
Fix ICE when rustdoc is scraping examples inside of a proc macro
willcrichton Nov 4, 2021
50a5ebe
rustc_llvm: update PassWrapper for recent LLVM
durin42 Nov 4, 2021
e6368c3
Rollup merge of #90530 - GuillaumeGomez:simplify-js-tester, r=notriddle
matthiaskrgr Nov 4, 2021
1b3b0e4
Rollup merge of #90533 - Smittyvb:patch-1, r=joshtriplett
matthiaskrgr Nov 4, 2021
f2266bb
Rollup merge of #90544 - ehuss:demote-locator-warn, r=petrochenkov
matthiaskrgr Nov 4, 2021
91bface
Rollup merge of #90554 - ehuss:unstable-options-cleanup, r=joshtriplett
matthiaskrgr Nov 4, 2021
f8ffbf5
Rollup merge of #90556 - scottmcm:carrying_comments, r=joshtriplett
matthiaskrgr Nov 4, 2021
468cade
Rollup merge of #90563 - joshtriplett:rustbot-allow-labels, r=Mark-Si…
matthiaskrgr Nov 4, 2021
448d1b8
Rollup merge of #90571 - GuillaumeGomez:missing-bottom-border-sidebar…
matthiaskrgr Nov 4, 2021
5360e37
Rollup merge of #90583 - willcrichton:example-analyzer, r=jyn514
matthiaskrgr Nov 4, 2021
167777f
Rollup merge of #90589 - durin42:llvm-14-ASO-now-struct, r=nikic
matthiaskrgr Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rustc_llvm: update PassWrapper for recent LLVM 
Now AddressSanitizerOptions is a struct, but at least the change was
tiny.

r? nikic
  • Loading branch information
@durin42
durin42 committed Nov 4, 2021
commit 50a5ebecd8a2edcfa128d3de75d045049f0f7c92
15 changes: 9 additions & 6 deletions compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,15 +885,18 @@ LLVMRustOptimizeWithNewPassManager(
OptimizerLastEPCallbacks.push_back(
[SanitizerOptions](ModulePassManager &MPM, OptimizationLevel Level) {
MPM.addPass(RequireAnalysisPass<ASanGlobalsMetadataAnalysis, Module>());
MPM.addPass(ModuleAddressSanitizerPass(
/*CompileKernel=*/false, SanitizerOptions->SanitizeAddressRecover));
#if LLVM_VERSION_GE(14, 0)
AddressSanitizerOptions opts(/*CompileKernel=*/false,
SanitizerOptions->SanitizeAddressRecover,
/*UseAfterScope=*/true,
AsanDetectStackUseAfterReturnMode::Runtime);
AddressSanitizerOptions opts = AddressSanitizerOptions{
/*CompileKernel=*/false,
SanitizerOptions->SanitizeAddressRecover,
/*UseAfterScope=*/false,
AsanDetectStackUseAfterReturnMode::Runtime,
};
MPM.addPass(ModuleAddressSanitizerPass(opts));
MPM.addPass(createModuleToFunctionPassAdaptor(AddressSanitizerPass(opts)));
#else
MPM.addPass(ModuleAddressSanitizerPass(
/*CompileKernel=*/false, SanitizerOptions->SanitizeAddressRecover));
MPM.addPass(createModuleToFunctionPassAdaptor(AddressSanitizerPass(
/*CompileKernel=*/false, SanitizerOptions->SanitizeAddressRecover,
/*UseAfterScope=*/true)));
Expand Down