From 9f406ce2c799cd39173f43cff8288674710f91d7 Mon Sep 17 00:00:00 2001
From: Manuel Drehwald <git@manuel.drehwald.info>
Date: Mon, 21 Jun 2021 01:38:25 +0200
Subject: [PATCH] addressing feedback

---
 compiler/rustc_codegen_llvm/src/llvm_util.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs
index a15edaf5138..1972e96d10e 100644
--- a/compiler/rustc_codegen_llvm/src/llvm_util.rs
+++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs
@@ -130,13 +130,12 @@ fn llvm_arg_to_arg_name(full_arg: &str) -> &str {
     llvm::LLVMInitializePasses();
 
     for plugin in &sess.opts.debugging_opts.llvm_plugins {
-        let path = CString::new(plugin.as_bytes()).unwrap();
-        let res = libc::dlopen(path.as_ptr(), libc::RTLD_LAZY | libc::RTLD_GLOBAL);
-        if res.is_null() {
-            println!("{}", CStr::from_ptr(libc::dlerror()).to_string_lossy().into_owned());
+        let path = path::Path::new(plugin);
+        let res = DynamicLibrary::open(path);
+        match res {
+            Ok(_) => debug!("configure_llvm: {}", plugin),
+            Err(e) => bug!("couldn't load plugin: {}", e),
         }
-        println!("{:p}", res);
-        println!("{}", plugin);
     }
 
     rustc_llvm::initialize_available_targets();
-- 
2.44.0