rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Never inline when no_sanitize attributes differ

Browse Source 
The inliner looks if a sanitizer is enabled before considering
`no_sanitize` attribute as possible source of incompatibility.

The MIR inlining could happen in a crate with sanitizer disabled, but
code generation in a crate with sanitizer enabled, thus the attribute
would be incorrectly ignored.

To avoid the issue never inline functions with different `no_sanitize`
attributes.
This commit is contained in:
Tomasz Miąsko
2020-11-11 00:00:00 +00:00
parent 9722952f0b
commit 0b4af1614d
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_mir/src/transform/inline.rs
View File

@@ -218,11 +218,7 @@ impl Inliner<'tcx> {
return false;
}
let self_no_sanitize =
self.codegen_fn_attrs.no_sanitize & self.tcx.sess.opts.debugging_opts.sanitizer;
let callee_no_sanitize =
codegen_fn_attrs.no_sanitize & self.tcx.sess.opts.debugging_opts.sanitizer;
if self_no_sanitize != callee_no_sanitize {
if self.codegen_fn_attrs.no_sanitize != codegen_fn_attrs.no_sanitize {
debug!("`callee has incompatible no_sanitize attribute - not inlining");
return false;
}