From 58d39a93a04ca1f322a1a899f59390339f696c36 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Wed, 8 May 2019 23:45:19 +0200
Subject: [PATCH 1/3] save-analysis: Fix ICE when processing associated
 constant

---
 src/librustc_save_analysis/dump_visitor.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs
index a45e32ddb6690..1e65f868ebac0 100644
--- a/src/librustc_save_analysis/dump_visitor.rs
+++ b/src/librustc_save_analysis/dump_visitor.rs
@@ -463,10 +463,12 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
         }
 
         // walk type and init value
-        self.visit_ty(typ);
-        if let Some(expr) = expr {
-            self.visit_expr(expr);
-        }
+        self.nest_tables(id, |v| {
+            v.visit_ty(typ);
+            if let Some(expr) = expr {
+                v.visit_expr(expr);
+            }
+        });
     }
 
     // FIXME tuple structs should generate tuple-specific data.

From e73ba21ce1c788c43ce2efd70e00176c1caacf02 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Thu, 9 May 2019 14:06:36 +0200
Subject: [PATCH 2/3] save-analysis: Add UI testsuite

---
 src/test/ui/save-analysis/issue-59134-0.rs     | 12 ++++++++++++
 src/test/ui/save-analysis/issue-59134-0.stderr |  9 +++++++++
 src/test/ui/save-analysis/issue-59134-1.rs     | 12 ++++++++++++
 src/test/ui/save-analysis/issue-59134-1.stderr |  9 +++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 src/test/ui/save-analysis/issue-59134-0.rs
 create mode 100644 src/test/ui/save-analysis/issue-59134-0.stderr
 create mode 100644 src/test/ui/save-analysis/issue-59134-1.rs
 create mode 100644 src/test/ui/save-analysis/issue-59134-1.stderr

diff --git a/src/test/ui/save-analysis/issue-59134-0.rs b/src/test/ui/save-analysis/issue-59134-0.rs
new file mode 100644
index 0000000000000..93c7fbbca8461
--- /dev/null
+++ b/src/test/ui/save-analysis/issue-59134-0.rs
@@ -0,0 +1,12 @@
+// compile-flags: -Zsave-analysis
+
+// Check that this doesn't ICE when processing associated const (field expr).
+
+pub fn f() {
+    trait Trait {}
+    impl Trait {
+        const FLAG: u32 = bogus.field; //~ ERROR cannot find value `bogus`
+    }
+}
+
+fn main() {}
\ No newline at end of file
diff --git a/src/test/ui/save-analysis/issue-59134-0.stderr b/src/test/ui/save-analysis/issue-59134-0.stderr
new file mode 100644
index 0000000000000..4e9b2e6fdeb4d
--- /dev/null
+++ b/src/test/ui/save-analysis/issue-59134-0.stderr
@@ -0,0 +1,9 @@
+error[E0425]: cannot find value `bogus` in this scope
+  --> $DIR/issue-59134-0.rs:8:27
+   |
+LL |         const FLAG: u32 = bogus.field;
+   |                           ^^^^^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/save-analysis/issue-59134-1.rs b/src/test/ui/save-analysis/issue-59134-1.rs
new file mode 100644
index 0000000000000..085f22cacbc58
--- /dev/null
+++ b/src/test/ui/save-analysis/issue-59134-1.rs
@@ -0,0 +1,12 @@
+// compile-flags: -Zsave-analysis
+
+// Check that this doesn't ICE when processing associated const (type).
+
+fn func() {
+    trait Trait {
+        type MyType;
+        const CONST: Self::MyType = bogus.field; //~ ERROR cannot find value `bogus`
+    }
+}
+
+fn main() {}
\ No newline at end of file
diff --git a/src/test/ui/save-analysis/issue-59134-1.stderr b/src/test/ui/save-analysis/issue-59134-1.stderr
new file mode 100644
index 0000000000000..bdc335eaac041
--- /dev/null
+++ b/src/test/ui/save-analysis/issue-59134-1.stderr
@@ -0,0 +1,9 @@
+error[E0425]: cannot find value `bogus` in this scope
+  --> $DIR/issue-59134-1.rs:8:37
+   |
+LL |         const CONST: Self::MyType = bogus.field;
+   |                                     ^^^^^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0425`.

From 0af18eed107f8b5d113e7d8e33f9182e37f0996b Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Thu, 9 May 2019 16:15:53 +0200
Subject: [PATCH 3/3] Appease tidy

---
 src/test/ui/save-analysis/issue-59134-0.rs | 2 +-
 src/test/ui/save-analysis/issue-59134-1.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/ui/save-analysis/issue-59134-0.rs b/src/test/ui/save-analysis/issue-59134-0.rs
index 93c7fbbca8461..3158328b3ff15 100644
--- a/src/test/ui/save-analysis/issue-59134-0.rs
+++ b/src/test/ui/save-analysis/issue-59134-0.rs
@@ -9,4 +9,4 @@ pub fn f() {
     }
 }
 
-fn main() {}
\ No newline at end of file
+fn main() {}
diff --git a/src/test/ui/save-analysis/issue-59134-1.rs b/src/test/ui/save-analysis/issue-59134-1.rs
index 085f22cacbc58..3cb629777a497 100644
--- a/src/test/ui/save-analysis/issue-59134-1.rs
+++ b/src/test/ui/save-analysis/issue-59134-1.rs
@@ -9,4 +9,4 @@ fn func() {
     }
 }
 
-fn main() {}
\ No newline at end of file
+fn main() {}