From e5e9867f604b9f656d529deb04a6b99338770c9e Mon Sep 17 00:00:00 2001
From: AB1908 <abhishekbhattachejree@live.com>
Date: Tue, 15 Jan 2019 08:26:29 +0000
Subject: [PATCH 1/2] Pass a default value when unwrapping a span

Fixes #57323
---
 src/librustc_metadata/native_libs.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs
index d35d64957b7b4..1f00086e32fe1 100644
--- a/src/librustc_metadata/native_libs.rs
+++ b/src/librustc_metadata/native_libs.rs
@@ -163,7 +163,7 @@ impl<'a, 'tcx> Collector<'a, 'tcx> {
            !self.tcx.features().static_nobundle {
             feature_gate::emit_feature_err(&self.tcx.sess.parse_sess,
                                            "static_nobundle",
-                                           span.unwrap(),
+                                           span.unwrap_or_else(|| syntax_pos::DUMMY_SP),
                                            GateIssue::Language,
                                            "kind=\"static-nobundle\" is feature gated");
         }

From 1e3f475d643603b9570710b13e20de587a22a5ea Mon Sep 17 00:00:00 2001
From: AB1908 <abhishekbhattachejree@live.com>
Date: Thu, 17 Jan 2019 03:40:36 +0000
Subject: [PATCH 2/2] Add test for linking non-existent static library

---
 src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs | 6 ++++++
 .../ui/feature-gate/feature-gate-static-nobundle-2.stderr  | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
 create mode 100644 src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr

diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
new file mode 100644
index 0000000000000..92844f9306d28
--- /dev/null
+++ b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
@@ -0,0 +1,6 @@
+//~ ERROR kind="static-nobundle" is feature gated
+// Test the behavior of rustc when non-existent library is statically linked
+
+// compile-flags: -l static-nobundle=nonexistent
+
+fn main() {}
diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
new file mode 100644
index 0000000000000..419c21901a02f
--- /dev/null
+++ b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
@@ -0,0 +1,7 @@
+error[E0658]: kind="static-nobundle" is feature gated (see issue #37403)
+   |
+   = help: add #![feature(static_nobundle)] to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.