Rustup to rustc 1.33.0-nightly (bf669d1e3 2019-01-25)

[rust.git] / src / main_shim.rs

diff --git a/src/main_shim.rs b/src/main_shim.rs
index ab0422e211b20829755a3afc46612d354b0396d7..446089fc9a161cea512de7c5a443b9dfaf1a5190 100644 (file)
--- a/src/main_shim.rs
+++ b/src/main_shim.rs
@@ -9,9 +9,9 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx: 'a>(
     use rustc::middle::lang_items::StartFnLangItem;
     use rustc::session::config::EntryFnType;
 
-    let (main_def_id, use_start_lang_item) = match *tcx.sess.entry_fn.borrow() {
-        Some((id, _, entry_ty)) => (
-            tcx.hir().local_def_id(id),
+    let (main_def_id, use_start_lang_item) = match tcx.entry_fn(LOCAL_CRATE) {
+        Some((def_id, entry_ty)) => (
+            def_id,
             match entry_ty {
                 EntryFnType::Main => true,
                 EntryFnType::Start => false,