From 13b82ecf80031cd0d50fa400ca87e044b292298d Mon Sep 17 00:00:00 2001
From: Alexander Regueiro <alexreg@me.com>
Date: Mon, 25 Jun 2018 00:08:36 +0100
Subject: [PATCH] Minor refactoring.

---
 src/librustc/mir/interpret/error.rs          |  2 +-
 src/librustc_mir/transform/qualify_consts.rs | 45 +++++++++-----------
 src/test/compile-fail/issue-28324.rs         |  2 +-
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/librustc/mir/interpret/error.rs b/src/librustc/mir/interpret/error.rs
index 2363e2870ec..7e2c144e0a7 100644
--- a/src/librustc/mir/interpret/error.rs
+++ b/src/librustc/mir/interpret/error.rs
@@ -306,7 +306,7 @@ pub fn description(&self) -> &str {
             ReadBytesAsPointer =>
                 "a memory access tried to interpret some bytes as a pointer",
             ReadForeignStatic =>
-                "tried to read foreign (extern) static",
+                "tried to read from foreign (extern) static",
             InvalidPointerMath =>
                 "attempted to do invalid arithmetic on pointers that would leak base addresses, e.g. comparing pointers into different allocations",
             ReadUndefBytes =>
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index 66106c7eca1..986957d5a82 100644
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -450,25 +450,26 @@ fn visit_place(&mut self,
         match *place {
             Place::Local(ref local) => self.visit_local(local, context, location),
             Place::Static(ref global) => {
-                // Only allow statics (not consts) to refer to other statics.
-                if !(self.mode == Mode::Static || self.mode == Mode::StaticMut) {
+                if self.tcx
+                       .get_attrs(global.def_id)
+                       .iter()
+                       .any(|attr| attr.check_name("thread_local")) {
+                    if self.mode != Mode::Fn {
+                        span_err!(self.tcx.sess, self.span, E0625,
+                                  "thread-local statics cannot be \
+                                   accessed at compile-time");
+                    }
                     self.add(Qualif::NOT_CONST);
+                    return;
                 }
 
-                if self.mode != Mode::Fn {
-                    if self.tcx
-                           .get_attrs(global.def_id)
-                           .iter()
-                           .any(|attr| attr.check_name("thread_local")) {
-                        span_err!(self.tcx.sess, self.span, E0625,
-                                    "thread-local statics cannot be \
-                                    accessed at compile-time");
-                        self.add(Qualif::NOT_CONST);
-                        return;
-                    }
+                // Only allow statics (not consts) to refer to other statics.
+                if self.mode == Mode::Static || self.mode == Mode::StaticMut {
+                    return;
                 }
+                self.add(Qualif::NOT_CONST);
 
-                if self.mode == Mode::Const || self.mode == Mode::ConstFn {
+                if self.mode != Mode::Fn {
                     let mut err = struct_span_err!(self.tcx.sess, self.span, E0013,
                                                    "{}s cannot refer to statics, use \
                                                     a constant instead", self.mode);
@@ -544,13 +545,11 @@ fn visit_place(&mut self,
     }
 
     fn visit_operand(&mut self, operand: &Operand<'tcx>, location: Location) {
+        self.super_operand(operand, location);
+
         match *operand {
             Operand::Copy(_) |
             Operand::Move(_) => {
-                self.nest(|this| {
-                    this.super_operand(operand, location);
-                });
-
                 // Mark the consumed locals to indicate later drops are noops.
                 if let Operand::Move(Place::Local(local)) = *operand {
                     self.local_qualif[local] = self.local_qualif[local].map(|q|
@@ -595,12 +594,10 @@ fn visit_rvalue(&mut self, rvalue: &Rvalue<'tcx>, location: Location) {
             }
 
             if is_reborrow {
-                self.nest(|this| {
-                    this.super_place(place, PlaceContext::Borrow {
-                        region,
-                        kind
-                    }, location);
-                });
+                self.super_place(place, PlaceContext::Borrow {
+                    region,
+                    kind
+                }, location);
             } else {
                 self.super_rvalue(rvalue, location);
             }
diff --git a/src/test/compile-fail/issue-28324.rs b/src/test/compile-fail/issue-28324.rs
index 369f919471c..0f9fe3fe246 100644
--- a/src/test/compile-fail/issue-28324.rs
+++ b/src/test/compile-fail/issue-28324.rs
@@ -16,6 +16,6 @@
 
 pub static BAZ: u32 = *&error_message_count;
 //~^ ERROR constant evaluation error
-//~| tried to read foreign (extern) static
+//~| tried to read from foreign (extern) static
 
 fn main() {}
-- 
2.44.0