diff options
| author | Denis Merigoux <denis.merigoux@gmail.com> | 2018-08-21 17:39:43 +0200 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2018-11-16 14:11:09 +0200 |
| commit | 1bcb4df16678a71b484ea9d1b65911f22b381d86 (patch) | |
| tree | 370b780f16b7594c571022d6f6efb4f27f12ab28 /src/librustc_codegen_llvm/builder.rs | |
| parent | bc86624c43a24ed569a08aaeae3bdea7be181bf7 (diff) | |
| download | rust-1bcb4df16678a71b484ea9d1b65911f22b381d86.tar.gz rust-1bcb4df16678a71b484ea9d1b65911f22b381d86.zip | |
Generalized OperandBundleDef in BuilderMethods
Diffstat (limited to 'src/librustc_codegen_llvm/builder.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/builder.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs index b63bd8f4e3d..f8ab6fc4ec2 100644 --- a/src/librustc_codegen_llvm/builder.rs +++ b/src/librustc_codegen_llvm/builder.rs @@ -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( |