diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2018-11-18 20:51:56 +0200 |
|---|---|---|
| committer | Simonas Kazlauskas <git@kazlauskas.me> | 2019-01-24 20:13:51 +0200 |
| commit | 4d97b2889345d69fa72233b787b30cff73232465 (patch) | |
| tree | 79fe78d9537f549c195864bccaa6d390cff72591 /src/librustc_codegen_llvm | |
| parent | dcf5482cdacd166268f9672f34697dd1da05ceea (diff) | |
| download | rust-4d97b2889345d69fa72233b787b30cff73232465.tar.gz rust-4d97b2889345d69fa72233b787b30cff73232465.zip | |
Support revisions for codegen tests
`compile-flags: -Copt-level` will avoid adding -O. Similarly for -g and -Cdebuglevel.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/attributes.rs | 6 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/declare.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs index 5a39e4f8b7f..a7d4f910f7a 100644 --- a/src/librustc_codegen_llvm/attributes.rs +++ b/src/librustc_codegen_llvm/attributes.rs @@ -155,8 +155,6 @@ pub fn from_fn_attrs( let codegen_fn_attrs = id.map(|id| cx.tcx.codegen_fn_attrs(id)) .unwrap_or_else(|| CodegenFnAttrs::new()); - inline(cx, llfn, codegen_fn_attrs.inline); - match codegen_fn_attrs.optimize { OptimizeAttr::None => { match cx.tcx.sess.opts.optimize { @@ -173,7 +171,7 @@ pub fn from_fn_attrs( OptLevel::No => { llvm::Attribute::MinSize.unapply_llfn(Function, llfn); llvm::Attribute::OptimizeForSize.unapply_llfn(Function, llfn); - llvm::Attribute::OptimizeNone.apply_llfn(Function, llfn); + llvm::Attribute::OptimizeNone.unapply_llfn(Function, llfn); } _ => {} } @@ -190,6 +188,8 @@ pub fn from_fn_attrs( } } + inline(cx, llfn, codegen_fn_attrs.inline); + // The `uwtable` attribute according to LLVM is: // // This attribute indicates that the ABI being targeted requires that an diff --git a/src/librustc_codegen_llvm/declare.rs b/src/librustc_codegen_llvm/declare.rs index 166c6ab9ae9..da45e0200d8 100644 --- a/src/librustc_codegen_llvm/declare.rs +++ b/src/librustc_codegen_llvm/declare.rs @@ -65,7 +65,7 @@ fn declare_raw_fn( } } - // FIXME(opt): this is kinda duplicated with similar code in attributes::from_fm_attrs… + // FIXME(opt): this is kinda duplicated with similar code in attributes::from_fn_attrs… match cx.tcx.sess.opts.optimize { OptLevel::Size => { llvm::Attribute::MinSize.unapply_llfn(Function, llfn); @@ -80,7 +80,7 @@ fn declare_raw_fn( OptLevel::No => { llvm::Attribute::MinSize.unapply_llfn(Function, llfn); llvm::Attribute::OptimizeForSize.unapply_llfn(Function, llfn); - llvm::Attribute::OptimizeNone.apply_llfn(Function, llfn); + llvm::Attribute::OptimizeNone.unapply_llfn(Function, llfn); } _ => {} } |