squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Disallow a form of invalid asm! macro

Browse source 
Fixes #21045
This commit is contained in:
Simonas Kazlauskas 2015-01-14 17:02:20 +02:00
parent f1241f14dc
commit 31261fd629
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libsyntax/ext/asm.rs
View file

@ -63,6 +63,12 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
'statement: loop {
match state {
Asm => {
if asm_str_style.is_some() {
// If we already have a string with instructions,
// ending up in Asm state again is an error.
cx.span_err(sp, "malformed inline assembly");
return DummyResult::expr(sp);
}
let (s, style) = match expr_to_string(cx, p.parse_expr(),
"inline assembly must be a string literal") {
Some((s, st)) => (s, st),

16
src/test/compile-fail/issue-21045.rs Normal file
View file

@ -0,0 +1,16 @@
// Copyright 2014 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(asm)]
fn main() {
let a;
asm!("nop" "nop"); //~ ERROR malformed inline assembly
asm!("nop" "nop" : "=r"(a)); //~ ERROR malformed inline assembly
}