Skip to content

Commit

Permalink
Auto merge of #50096 - alexcrichton:less-simd-warnings, r=michaelwoer…
Browse files Browse the repository at this point in the history
…ister

Tweak some warnings around #[target_feature]

This commit fixes up some issues discovered when getting the `stdsimd` crate's CI compiling again.
  • Loading branch information
bors committed Apr 24, 2018
2 parents f5203d1 + 81a6437 commit 190a6c4
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/librustc_typeck/collect.rs
Expand Up @@ -1682,6 +1682,7 @@ fn is_foreign_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,

fn from_target_feature(
tcx: TyCtxt,
id: DefId,
attr: &ast::Attribute,
whitelist: &FxHashMap<String, Option<String>>,
target_features: &mut Vec<Symbol>,
Expand Down Expand Up @@ -1752,7 +1753,7 @@ fn from_target_feature(
Some(name) => bug!("unknown target feature gate {}", name),
None => true,
};
if !allowed {
if !allowed && id.is_local() {
feature_gate::emit_feature_err(
&tcx.sess.parse_sess,
feature_gate.as_ref().unwrap(),
Expand Down Expand Up @@ -1877,7 +1878,7 @@ fn trans_fn_attrs<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, id: DefId) -> TransFnAt
`unsafe` function";
tcx.sess.span_err(attr.span, msg);
}
from_target_feature(tcx, attr, &whitelist, &mut trans_fn_attrs.target_features);
from_target_feature(tcx, id, attr, &whitelist, &mut trans_fn_attrs.target_features);
} else if attr.check_name("linkage") {
if let Some(val) = attr.value_str() {
trans_fn_attrs.linkage = Some(linkage_by_name(tcx, id, &val.as_str()));
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/feature_gate.rs
Expand Up @@ -936,7 +936,7 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
"the `#[naked]` attribute \
is an experimental feature",
cfg_fn!(naked_functions))),
("target_feature", Normal, Ungated),
("target_feature", Whitelisted, Ungated),
("export_name", Whitelisted, Ungated),
("inline", Whitelisted, Ungated),
("link", Whitelisted, Ungated),
Expand Down
15 changes: 15 additions & 0 deletions src/test/run-pass/auxiliary/using-target-feature-unstable.rs
@@ -0,0 +1,15 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(mmx_target_feature)]

#[inline]
#[target_feature(enable = "mmx")]
pub unsafe fn foo() {}
20 changes: 20 additions & 0 deletions src/test/run-pass/using-target-feature-unstable.rs
@@ -0,0 +1,20 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// only-x86_64
// aux-build:using-target-feature-unstable.rs

extern crate using_target_feature_unstable;

fn main() {
unsafe {
using_target_feature_unstable::foo();
}
}

0 comments on commit 190a6c4

Please sign in to comment.