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

rustc_codegen_llvm: use safe references for OperandBundleDef.

Browse source
This commit is contained in:
Irina Popa 2018-07-16 16:02:31 +03:00
parent 92af9694b9
commit 0ab3444540
4 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_codegen_llvm/builder.rs
View file

@ -23,7 +23,6 @@ use std::borrow::Cow;
use std::ffi::CString;
use std::ops::Range;
use std::ptr;
use std::ptr::NonNull;
// All Builders must have an llfn associated with them
#[must_use]
@ -176,7 +175,7 @@ impl Builder<'a, 'll, 'tcx> {
args: &[&'ll Value],
then: &'ll BasicBlock,
catch: &'ll BasicBlock,
bundle: Option<&OperandBundleDef>) -> &'ll Value {
bundle: Option<&OperandBundleDef<'ll>>) -> &'ll Value {
self.count_insn("invoke");
debug!("Invoke {:?} with args ({:?})",
@ -184,7 +183,7 @@ impl Builder<'a, 'll, 'tcx> {
args);
let args = self.check_call("invoke", llfn, args);
let bundle = bundle.as_ref().and_then(|b| NonNull::new(b.raw()));
let bundle = bundle.map(|b| &*b.raw);
unsafe {
llvm::LLVMRustBuildInvoke(self.llbuilder,
@ -724,7 +723,7 @@ impl Builder<'a, 'll, 'tcx> {
}
pub fn call(&self, llfn: &'ll Value, args: &[&'ll Value],
bundle: Option<&OperandBundleDef>) -> &'ll Value {
bundle: Option<&OperandBundleDef<'ll>>) -> &'ll Value {
self.count_insn("call");
debug!("Call {:?} with args ({:?})",
@ -732,7 +731,7 @@ impl Builder<'a, 'll, 'tcx> {
args);
let args = self.check_call("call", llfn, args);
let bundle = bundle.as_ref().and_then(|b| NonNull::new(b.raw()));
let bundle = bundle.map(|b| &*b.raw);
unsafe {
llvm::LLVMRustBuildCall(self.llbuilder, llfn, args.as_ptr(),