From 7e7b93033c51e8ba73776ce3b91327a673db5b36 Mon Sep 17 00:00:00 2001
From: Syrus <me@syrusakbary.com>
Date: Sat, 1 May 2021 00:50:03 -0700
Subject: [PATCH] Fixed unallocated libraries

---
 lib/engine-native/src/artifact.rs |  7 +++++--
 lib/engine-native/src/engine.rs   | 11 -----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/engine-native/src/artifact.rs b/lib/engine-native/src/artifact.rs
index c95e70e8e5f..11972f74c4e 100644
--- a/lib/engine-native/src/artifact.rs
+++ b/lib/engine-native/src/artifact.rs
@@ -49,6 +49,9 @@ pub struct NativeArtifact {
     finished_dynamic_function_trampolines: BoxedSlice<FunctionIndex, FunctionBodyPtr>,
     func_data_registry: Arc<FuncDataRegistry>,
     signatures: BoxedSlice<SignatureIndex, VMSharedSignatureIndex>,
+    #[allow(dead_code)]
+    #[loupe(skip)]
+    library: Option<Library>,
 }
 
 fn to_compile_error(err: impl Error) -> CompileError {
@@ -371,6 +374,7 @@ impl NativeArtifact {
                 .into_boxed_slice(),
             func_data_registry: Arc::new(FuncDataRegistry::new()),
             signatures: signatures.into_boxed_slice(),
+            library: None,
         })
     }
 
@@ -463,11 +467,10 @@ impl NativeArtifact {
                 .collect::<PrimaryMap<_, _>>()
         };
 
-        engine_inner.add_library(lib);
-
         Ok(Self {
             sharedobject_path,
             metadata,
+            library: Some(lib),
             finished_functions: finished_functions.into_boxed_slice(),
             finished_function_call_trampolines: finished_function_call_trampolines
                 .into_boxed_slice(),
diff --git a/lib/engine-native/src/engine.rs b/lib/engine-native/src/engine.rs
index 196f743a0d2..1e2b34dd962 100644
--- a/lib/engine-native/src/engine.rs
+++ b/lib/engine-native/src/engine.rs
@@ -1,7 +1,6 @@
 //! Native Engine.
 
 use crate::NativeArtifact;
-use libloading::Library;
 use loupe::MemoryUsage;
 use std::path::Path;
 use std::sync::Arc;
@@ -42,7 +41,6 @@ impl NativeEngine {
                 features,
                 is_cross_compiling,
                 linker,
-                libraries: vec![],
             })),
             target: Arc::new(target),
             engine_id: EngineId::default(),
@@ -74,7 +72,6 @@ impl NativeEngine {
                 prefixer: None,
                 is_cross_compiling: false,
                 linker: Linker::None,
-                libraries: vec![],
             })),
             target: Arc::new(Target::default()),
             engine_id: EngineId::default(),
@@ -259,10 +256,6 @@ pub struct NativeEngineInner {
 
     /// The linker to use.
     linker: Linker,
-
-    /// List of libraries loaded by this engine.
-    #[loupe(skip)]
-    libraries: Vec<Library>,
 }
 
 impl NativeEngineInner {
@@ -323,8 +316,4 @@ impl NativeEngineInner {
     pub(crate) fn linker(&self) -> Linker {
         self.linker
     }
-
-    pub(crate) fn add_library(&mut self, library: Library) {
-        self.libraries.push(library);
-    }
 }