Auto merge of #27927 - DiamondLovesYou:no-asm, r=alexcrichton
This commit is contained in:
commit
54b2eced63
4 changed files with 49 additions and 0 deletions
|
@ -112,6 +112,7 @@ pub mod middle {
|
||||||
pub mod check_static_recursion;
|
pub mod check_static_recursion;
|
||||||
pub mod check_loop;
|
pub mod check_loop;
|
||||||
pub mod check_match;
|
pub mod check_match;
|
||||||
|
pub mod check_no_asm;
|
||||||
pub mod check_rvalues;
|
pub mod check_rvalues;
|
||||||
pub mod const_eval;
|
pub mod const_eval;
|
||||||
pub mod dataflow;
|
pub mod dataflow;
|
||||||
|
|
41
src/librustc/middle/check_no_asm.rs
Normal file
41
src/librustc/middle/check_no_asm.rs
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
// Copyright 2015 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.
|
||||||
|
|
||||||
|
/// Run over the whole crate and check for ExprInlineAsm.
|
||||||
|
/// Inline asm isn't allowed on virtual ISA based targets, so we reject it
|
||||||
|
/// here.
|
||||||
|
|
||||||
|
use session::Session;
|
||||||
|
|
||||||
|
use syntax::ast;
|
||||||
|
use syntax::visit::Visitor;
|
||||||
|
use syntax::visit;
|
||||||
|
|
||||||
|
pub fn check_crate(sess: &Session, krate: &ast::Crate) {
|
||||||
|
if sess.target.target.options.allow_asm { return; }
|
||||||
|
|
||||||
|
visit::walk_crate(&mut CheckNoAsm { sess: sess, }, krate);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Copy, Clone)]
|
||||||
|
struct CheckNoAsm<'a> {
|
||||||
|
sess: &'a Session,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a, 'v> Visitor<'v> for CheckNoAsm<'a> {
|
||||||
|
fn visit_expr(&mut self, e: &ast::Expr) {
|
||||||
|
match e.node {
|
||||||
|
ast::ExprInlineAsm(_) => self.sess.span_err(e.span,
|
||||||
|
"asm! is unsupported on this target"),
|
||||||
|
_ => {},
|
||||||
|
}
|
||||||
|
visit::walk_expr(self, e)
|
||||||
|
}
|
||||||
|
}
|
|
@ -168,6 +168,8 @@ pub struct TargetOptions {
|
||||||
/// currently only "gnu" is used to fall into LLVM. Unknown strings cause
|
/// currently only "gnu" is used to fall into LLVM. Unknown strings cause
|
||||||
/// the system linker to be used.
|
/// the system linker to be used.
|
||||||
pub archive_format: String,
|
pub archive_format: String,
|
||||||
|
/// Is asm!() allowed? Defaults to true.
|
||||||
|
pub allow_asm: bool,
|
||||||
/// Whether the target uses a custom unwind resumption routine.
|
/// Whether the target uses a custom unwind resumption routine.
|
||||||
/// By default LLVM lowers `resume` instructions into calls to `_Unwind_Resume`
|
/// By default LLVM lowers `resume` instructions into calls to `_Unwind_Resume`
|
||||||
/// defined in libgcc. If this option is enabled, the target must provide
|
/// defined in libgcc. If this option is enabled, the target must provide
|
||||||
|
@ -217,6 +219,7 @@ impl Default for TargetOptions {
|
||||||
custom_unwind_resume: false,
|
custom_unwind_resume: false,
|
||||||
lib_allocation_crate: "alloc_system".to_string(),
|
lib_allocation_crate: "alloc_system".to_string(),
|
||||||
exe_allocation_crate: "alloc_system".to_string(),
|
exe_allocation_crate: "alloc_system".to_string(),
|
||||||
|
allow_asm: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -310,6 +313,7 @@ impl Target {
|
||||||
key!(no_compiler_rt, bool);
|
key!(no_compiler_rt, bool);
|
||||||
key!(pre_link_args, list);
|
key!(pre_link_args, list);
|
||||||
key!(post_link_args, list);
|
key!(post_link_args, list);
|
||||||
|
key!(allow_asm, bool);
|
||||||
|
|
||||||
base
|
base
|
||||||
}
|
}
|
||||||
|
|
|
@ -563,6 +563,9 @@ pub fn phase_2_configure_and_expand(sess: &Session,
|
||||||
time(time_passes, "checking that all macro invocations are gone", ||
|
time(time_passes, "checking that all macro invocations are gone", ||
|
||||||
syntax::ext::expand::check_for_macros(&sess.parse_sess, &krate));
|
syntax::ext::expand::check_for_macros(&sess.parse_sess, &krate));
|
||||||
|
|
||||||
|
time(time_passes, "checking for inline asm in case the target doesn't support it", ||
|
||||||
|
middle::check_no_asm::check_crate(sess, &krate));
|
||||||
|
|
||||||
// One final feature gating of the true AST that gets compiled
|
// One final feature gating of the true AST that gets compiled
|
||||||
// later, to make sure we've got everything (e.g. configuration
|
// later, to make sure we've got everything (e.g. configuration
|
||||||
// can insert new attributes via `cfg_attr`)
|
// can insert new attributes via `cfg_attr`)
|
||||||
|
|
Loading…
Reference in a new issue