Fix regression in promotion of rvalues referencing a static

src/librustc_passes/consts.rs

@@ -327,7 +327,28 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>, e: &hir::Expr, node
             let def = v.tables.qpath_def(qpath, e.hir_id);
             match def {
                 Def::VariantCtor(..) | Def::StructCtor(..) |
-                Def::Fn(..) | Def::Method(..) => {}
+                Def::Fn(..) | Def::Method(..) =>  {}
+
+                // References to a static are inherently promotable,
+                // with the exception of "#[thread_loca]" statics.
+                // The latter may not outlive the current function
+                Def::Static(did, _) => {
+                    let mut thread_local = false;
+
+                    for attr in &v.tcx.get_attrs(did)[..] {
+                        if attr.check_name("thread_local") {
+                            debug!("Static(id={:?}) is unpromotable \
+                                   due to a #[thread_local] attribute", did);
+                            v.promotable = false;
+                            thread_local = true;
+                            break;
+                        }
+                    }
+
+                    if !thread_local {
+                        debug!("Allowing promotion of reference to Static(id={:?})", did);
+                    }
+                }
 
                 Def::Const(did) |
                 Def::AssociatedConst(did) => {

src/test/run-pass/issue-44373.rs

@@ -0,0 +1,18 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+struct Foo(bool);
+
+struct Container(&'static [&'static Foo]);
+
+static FOO: Foo = Foo(true);
+static CONTAINER: Container = Container(&[&FOO]);
+
+fn main() {}