about summary refs log tree commit diff
path: root/src/librustc_trans_utils
diff options
context:
space:
mode:
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-04-01 08:18:10 +0200
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-04-10 14:40:25 +0200
commite82b6c42b47ef9cadf2d86395fde3a3d9d5ff628 (patch)
tree8b4e7ea0cac66a9f195f62092e46ac94262d3525 /src/librustc_trans_utils
parent27adb31fcc2e31ca5528112260a5981fa91d687e (diff)
downloadrust-e82b6c42b47ef9cadf2d86395fde3a3d9d5ff628.tar.gz
rust-e82b6c42b47ef9cadf2d86395fde3a3d9d5ff628.zip
Make Session.plugin_registrar_fn and Session.derive_registrar_fn thread-safe
Diffstat (limited to 'src/librustc_trans_utils')
-rw-r--r--src/librustc_trans_utils/symbol_names.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_trans_utils/symbol_names.rs b/src/librustc_trans_utils/symbol_names.rs
index af174f7ce85..f3b7326b210 100644
--- a/src/librustc_trans_utils/symbol_names.rs
+++ b/src/librustc_trans_utils/symbol_names.rs
@@ -244,11 +244,11 @@ fn compute_symbol_name<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, instance: Instance
     let node_id = tcx.hir.as_local_node_id(def_id);
 
     if let Some(id) = node_id {
-        if tcx.sess.plugin_registrar_fn.get() == Some(id) {
+        if *tcx.sess.plugin_registrar_fn.get() == Some(id) {
             let disambiguator = tcx.sess.local_crate_disambiguator();
             return tcx.sess.generate_plugin_registrar_symbol(disambiguator);
         }
-        if tcx.sess.derive_registrar_fn.get() == Some(id) {
+        if *tcx.sess.derive_registrar_fn.get() == Some(id) {
             let disambiguator = tcx.sess.local_crate_disambiguator();
             return tcx.sess.generate_derive_registrar_symbol(disambiguator);
         }