Skip to content

Commit

Permalink
Disallow a form of invalid asm! macro
Browse files Browse the repository at this point in the history
Fixes #21045
  • Loading branch information
nagisa committed Jan 14, 2015
1 parent f1241f1 commit 31261fd
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/libsyntax/ext/asm.rs
Expand Up @@ -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),
Expand Down
16 changes: 16 additions & 0 deletions src/test/compile-fail/issue-21045.rs
@@ -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
}

0 comments on commit 31261fd

Please sign in to comment.