diff options
| -rw-r--r-- | runtime/plugin.cc | 5 | ||||
| -rw-r--r-- | runtime/plugin.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/runtime/plugin.cc b/runtime/plugin.cc index 7d86f1d5dc..6f1c5179f9 100644 --- a/runtime/plugin.cc +++ b/runtime/plugin.cc @@ -28,10 +28,7 @@ const char* PLUGIN_INITIALIZATION_FUNCTION_NAME = "ArtPlugin_Initialize"; const char* PLUGIN_DEINITIALIZATION_FUNCTION_NAME = "ArtPlugin_Deinitialize"; Plugin::Plugin(const Plugin& other) : library_(other.library_), dlopen_handle_(nullptr) { - if (other.IsLoaded()) { - std::string err; - Load(&err); - } + CHECK(!other.IsLoaded()) << "Should not copy loaded plugins."; } bool Plugin::Load(/*out*/std::string* error_msg) { diff --git a/runtime/plugin.h b/runtime/plugin.h index 909c710a96..4885b2e3c0 100644 --- a/runtime/plugin.h +++ b/runtime/plugin.h @@ -60,7 +60,7 @@ class Plugin { Plugin(const Plugin& other); // Create move constructor for putting this in a list - Plugin(Plugin&& other) + Plugin(Plugin&& other) noexcept : library_(other.library_), dlopen_handle_(other.dlopen_handle_) { other.dlopen_handle_ = nullptr; |