Merge pull request #239 from rust-lang/fix/expandloadu
Escape { and } in inline asm
This commit is contained in:
commit
3c03c8f048
22
src/asm.rs
22
src/asm.rs
@ -381,15 +381,19 @@ fn codegen_inline_asm(&mut self, template: &[InlineAsmTemplatePiece], rust_opera
|
||||
for piece in template {
|
||||
match *piece {
|
||||
InlineAsmTemplatePiece::String(ref string) => {
|
||||
// TODO(@Commeownist): switch to `Iterator::intersperse` once it's stable
|
||||
let mut iter = string.split('%');
|
||||
if let Some(s) = iter.next() {
|
||||
template_str.push_str(s);
|
||||
}
|
||||
|
||||
for s in iter {
|
||||
template_str.push_str("%%");
|
||||
template_str.push_str(s);
|
||||
for char in string.chars() {
|
||||
// TODO(antoyo): might also need to escape | if rustc doesn't do it.
|
||||
let escaped_char =
|
||||
match char {
|
||||
'%' => "%%",
|
||||
'{' => "%{",
|
||||
'}' => "%}",
|
||||
_ => {
|
||||
template_str.push(char);
|
||||
continue;
|
||||
},
|
||||
};
|
||||
template_str.push_str(escaped_char);
|
||||
}
|
||||
}
|
||||
InlineAsmTemplatePiece::Placeholder { operand_idx, modifier, span: _ } => {
|
||||
|
Loading…
Reference in New Issue
Block a user