From 92189bc521ce3256a53c1b435dfb6ec6740f4734 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Fri, 5 Jan 2018 14:27:20 +0100 Subject: Remove redundant -Zdebug-llvm option The same effect can be achieved using -Cllvm-args=-debug Refs #46437 as it removes LLVMRustSetDebug() --- src/rustllvm/RustWrapper.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/rustllvm/RustWrapper.cpp') diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 0fac7f7bf28..e9eaad853d5 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -384,12 +384,6 @@ LLVMRustBuildAtomicFence(LLVMBuilderRef B, LLVMAtomicOrdering Order, return wrap(unwrap(B)->CreateFence(fromRust(Order), fromRust(Scope))); } -extern "C" void LLVMRustSetDebug(int Enabled) { -#ifndef NDEBUG - DebugFlag = Enabled; -#endif -} - enum class LLVMRustAsmDialect { Other, Att, -- cgit 1.4.1-3-g733a5 From 4be1d5c37be04b8a84aa34081238746a0967016f Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Fri, 5 Jan 2018 14:28:50 +0100 Subject: Remove dead function LLVMRustLinkInParsedExternalBitcode() Refs #46437 --- src/librustc_llvm/ffi.rs | 1 - src/rustllvm/RustWrapper.cpp | 17 ----------------- 2 files changed, 18 deletions(-) (limited to 'src/rustllvm/RustWrapper.cpp') diff --git a/src/librustc_llvm/ffi.rs b/src/librustc_llvm/ffi.rs index 79909c3c5ae..8ed3953b814 100644 --- a/src/librustc_llvm/ffi.rs +++ b/src/librustc_llvm/ffi.rs @@ -1607,7 +1607,6 @@ extern "C" { pub fn LLVMRustSetNormalizedTarget(M: ModuleRef, triple: *const c_char); pub fn LLVMRustAddAlwaysInlinePass(P: PassManagerBuilderRef, AddLifetimes: bool); pub fn LLVMRustLinkInExternalBitcode(M: ModuleRef, bc: *const c_char, len: size_t) -> bool; - pub fn LLVMRustLinkInParsedExternalBitcode(M: ModuleRef, M: ModuleRef) -> bool; pub fn LLVMRustRunRestrictionPass(M: ModuleRef, syms: *const *const c_char, len: size_t); pub fn LLVMRustMarkAllFunctionsNounwind(M: ModuleRef); diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index e9eaad853d5..8030a545ec3 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -927,23 +927,6 @@ extern "C" bool LLVMRustLinkInExternalBitcode(LLVMModuleRef DstRef, char *BC, return true; } -extern "C" bool LLVMRustLinkInParsedExternalBitcode( - LLVMModuleRef DstRef, LLVMModuleRef SrcRef) { -#if LLVM_VERSION_GE(4, 0) - Module *Dst = unwrap(DstRef); - std::unique_ptr Src(unwrap(SrcRef)); - - if (Linker::linkModules(*Dst, std::move(Src))) { - LLVMRustSetLastError("failed to link modules"); - return false; - } - return true; -#else - LLVMRustSetLastError("can't link parsed modules on this LLVM"); - return false; -#endif -} - // Note that the two following functions look quite similar to the // LLVMGetSectionName function. Sadly, it appears that this function only // returns a char* pointer, which isn't guaranteed to be null-terminated. The -- cgit 1.4.1-3-g733a5 From ebc85077df1ebc603e24495151ba5db1159a42d1 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Fri, 5 Jan 2018 15:22:35 +0100 Subject: Remove dead function rustc_llvm::debug_loc_to_string() Refs #46437 as it also removes LLVMRustWriteDebugLocToString() --- src/librustc_llvm/ffi.rs | 2 -- src/librustc_llvm/lib.rs | 5 ----- src/rustllvm/RustWrapper.cpp | 8 -------- src/rustllvm/rustllvm.h | 1 - 4 files changed, 16 deletions(-) (limited to 'src/rustllvm/RustWrapper.cpp') diff --git a/src/librustc_llvm/ffi.rs b/src/librustc_llvm/ffi.rs index 8ed3953b814..2cfb151ae85 100644 --- a/src/librustc_llvm/ffi.rs +++ b/src/librustc_llvm/ffi.rs @@ -1642,8 +1642,6 @@ extern "C" { pub fn LLVMRustWriteDiagnosticInfoToString(DI: DiagnosticInfoRef, s: RustStringRef); pub fn LLVMRustGetDiagInfoKind(DI: DiagnosticInfoRef) -> DiagnosticKind; - pub fn LLVMRustWriteDebugLocToString(C: ContextRef, DL: DebugLocRef, s: RustStringRef); - pub fn LLVMRustSetInlineAsmDiagnosticHandler(C: ContextRef, H: InlineAsmDiagHandler, CX: *mut c_void); diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index 592bd620564..c75a026a0f8 100644 --- a/src/librustc_llvm/lib.rs +++ b/src/librustc_llvm/lib.rs @@ -296,11 +296,6 @@ pub unsafe fn twine_to_string(tr: TwineRef) -> String { build_string(|s| LLVMRustWriteTwineToString(tr, s)).expect("got a non-UTF8 Twine from LLVM") } -pub unsafe fn debug_loc_to_string(c: ContextRef, tr: DebugLocRef) -> String { - build_string(|s| LLVMRustWriteDebugLocToString(c, tr, s)) - .expect("got a non-UTF8 DebugLoc from LLVM") -} - pub fn initialize_available_targets() { macro_rules! init_target( ($cfg:meta, $($method:ident),*) => { { diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 8030a545ec3..95130d596e1 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -958,7 +958,6 @@ extern "C" LLVMTypeRef LLVMRustArrayType(LLVMTypeRef ElementTy, } DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Twine, LLVMTwineRef) -DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DebugLoc, LLVMDebugLocRef) extern "C" void LLVMRustWriteTwineToString(LLVMTwineRef T, RustStringRef Str) { RawRustStringOstream OS(Str); @@ -1107,13 +1106,6 @@ extern "C" LLVMTypeKind LLVMRustGetTypeKind(LLVMTypeRef Ty) { report_fatal_error("Unhandled TypeID."); } -extern "C" void LLVMRustWriteDebugLocToString(LLVMContextRef C, - LLVMDebugLocRef DL, - RustStringRef Str) { - RawRustStringOstream OS(Str); - unwrap(DL)->print(OS); -} - DEFINE_SIMPLE_CONVERSION_FUNCTIONS(SMDiagnostic, LLVMSMDiagnosticRef) extern "C" void LLVMRustSetInlineAsmDiagnosticHandler( diff --git a/src/rustllvm/rustllvm.h b/src/rustllvm/rustllvm.h index 714173f8602..b92834bc940 100644 --- a/src/rustllvm/rustllvm.h +++ b/src/rustllvm/rustllvm.h @@ -103,7 +103,6 @@ enum LLVMRustAttribute { typedef struct OpaqueRustString *RustStringRef; typedef struct LLVMOpaqueTwine *LLVMTwineRef; -typedef struct LLVMOpaqueDebugLoc *LLVMDebugLocRef; typedef struct LLVMOpaqueSMDiagnostic *LLVMSMDiagnosticRef; typedef struct LLVMOpaqueRustJITMemoryManager *LLVMRustJITMemoryManagerRef; -- cgit 1.4.1-3-g733a5