diff options
| author | Alexis Bourget <alexis.bourget@gmail.com> | 2020-07-19 22:15:44 +0200 |
|---|---|---|
| committer | Alexis Bourget <alexis.bourget@gmail.com> | 2020-07-19 22:15:44 +0200 |
| commit | 471dd52d7710dcad5fec0cd731b836b02ba4a8f4 (patch) | |
| tree | 4f7a1b7fcf01c8fb5c255a5af32b3906b44d38fa /src/rustllvm/RustWrapper.cpp | |
| parent | e88220f86749d88e53c5dbaa421dcaba1889f86c (diff) | |
| parent | d7f94516345a36ddfcd68cbdf1df835d356795c3 (diff) | |
| download | rust-471dd52d7710dcad5fec0cd731b836b02ba4a8f4.tar.gz rust-471dd52d7710dcad5fec0cd731b836b02ba4a8f4.zip | |
Fix merge conflict with recent PR
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index c92cf65f98a..667bf4a2ded 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -1395,7 +1395,7 @@ extern "C" LLVMValueRef LLVMRustBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, FTy, Callee, makeArrayRef(unwrap(Args), NumArgs), Bundles)); } -extern "C" LLVMValueRef LLVMRustGetInstrprofIncrementIntrinsic(LLVMModuleRef M) { +extern "C" LLVMValueRef LLVMRustGetInstrProfIncrementIntrinsic(LLVMModuleRef M) { return wrap(llvm::Intrinsic::getDeclaration(unwrap(M), (llvm::Intrinsic::ID)llvm::Intrinsic::instrprof_increment)); } |