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

Generalized OperandBundleDef in BuilderMethods

Browse source
This commit is contained in:
Denis Merigoux 2018-08-21 17:39:43 +02:00 • committed by Eduard-Mihai Burtescu
parent bc86624c43
commit 1bcb4df166
4 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_codegen_llvm/builder.rs
View file

@ -191,7 +191,7 @@ impl BuilderMethods<'a, 'll, 'tcx, Value, BasicBlock>
args: &[&'ll Value],
then: &'ll BasicBlock,
catch: &'ll BasicBlock,
bundle: Option<&OperandBundleDef<'ll>>) -> &'ll Value {
bundle: Option<&traits::OperandBundleDef<'ll, &'ll Value>>) -> &'ll Value {
self.count_insn("invoke");
debug!("Invoke {:?} with args ({:?})",
@ -199,7 +199,7 @@ impl BuilderMethods<'a, 'll, 'tcx, Value, BasicBlock>
args);
let args = self.check_call("invoke", llfn, args);
let bundle = bundle.map(|b| &*b.raw);
let bundle = bundle.map(|b| &*(OperandBundleDef::from_generic(b)).raw);
unsafe {
llvm::LLVMRustBuildInvoke(self.llbuilder,
@ -1191,7 +1191,7 @@ impl BuilderMethods<'a, 'll, 'tcx, Value, BasicBlock>
}
fn call(&self, llfn: &'ll Value, args: &[&'ll Value],
bundle: Option<&OperandBundleDef<'ll>>) -> &'ll Value {
bundle: Option<&traits::OperandBundleDef<'ll, &'ll Value>>) -> &'ll Value {
self.count_insn("call");
debug!("Call {:?} with args ({:?})",
@ -1199,7 +1199,7 @@ impl BuilderMethods<'a, 'll, 'tcx, Value, BasicBlock>
args);
let args = self.check_call("call", llfn, args);
let bundle = bundle.map(|b| &*b.raw);
let bundle = bundle.map(|b| &*(OperandBundleDef::from_generic(b)).raw);
unsafe {
llvm::LLVMRustBuildCall(