bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Generalized AsmDialect for BuilderMethods

Browse source
This commit is contained in:
Denis Merigoux 2018-08-21 18:22:29 +02:00 • committed by Eduard-Mihai Burtescu
parent b761538997
commit 1ca750683e
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc_codegen_llvm/builder.rs
View file

@ -20,6 +20,7 @@ use rustc::ty::layout::{Align, Size};
use rustc::session::{config, Session};
use rustc_data_structures::small_c_str::SmallCStr;
use traits::{self, BuilderMethods};
use syntax;
use std::borrow::Cow;
use std::ops::Range;
@ -742,7 +743,7 @@ impl BuilderMethods<'a, 'll, 'tcx, Value, BasicBlock>
fn inline_asm_call(&self, asm: *const c_char, cons: *const c_char,
inputs: &[&'ll Value], output: &'ll Type,
volatile: bool, alignstack: bool,
dia: AsmDialect) -> Option<&'ll Value> {
dia: syntax::ast::AsmDialect) -> Option<&'ll Value> {
self.count_insn("inlineasm");
let volatile = if volatile { llvm::True }
@ -763,7 +764,7 @@ impl BuilderMethods<'a, 'll, 'tcx, Value, BasicBlock>
debug!("Constraint verification result: {:?}", constraints_ok);
if constraints_ok {
let v = llvm::LLVMRustInlineAsm(
fty, asm, cons, volatile, alignstack, dia);
fty, asm, cons, volatile, alignstack, AsmDialect::from_generic(dia));
Some(self.call(v, inputs, None))
} else {
// LLVM has detected an issue with our constraints, bail out