squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #28484 - nrc:fix-save, r=alexcrichton

Browse source 
Should be lowering ast expressions to HIR expressions, not cheating via the hir map. That goes wrong now that there is not a 1:1 mapping between ast and hir (in the case of the crash due to ExprParen).
This commit is contained in:
bors 2015-09-19 00:08:38 +00:00
commit 6e5a325474
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_trans/save/dump_csv.rs
View file

@ -1097,7 +1097,7 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DumpCsvVisitor<'l, 'tcx> {
self.visit_expr(&**sub_ex);
let hir_node = self.tcx.map.expect_expr(sub_ex.id);
let hir_node = lower_expr(sub_ex);
let ty = &self.tcx.expr_ty_adjusted(&hir_node).sty;
match *ty {
ty::TyStruct(def, _) => {

8
src/librustc_trans/save/mod.rs
View file

@ -18,7 +18,7 @@ use std::path::{Path, PathBuf};
use rustc_front;
use rustc::front::map::NodeItem;
use rustc_front::hir;
use rustc_front::{hir, lowering};
use syntax::attr;
use syntax::ast::{self, NodeId};
@ -442,7 +442,7 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
pub fn get_expr_data(&self, expr: &ast::Expr) -> Option<Data> {
match expr.node {
ast::ExprField(ref sub_ex, ident) => {
let hir_node = self.tcx.map.expect_expr(sub_ex.id);
let hir_node = lowering::lower_expr(sub_ex);
let ty = &self.tcx.expr_ty_adjusted(&hir_node).sty;
match *ty {
ty::TyStruct(def, _) => {
@ -462,8 +462,8 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
}
}
ast::ExprStruct(ref path, _, _) => {
let hir_node = self.tcx.map.expect_expr(expr.id);
let ty = &self.tcx.expr_ty_adjusted(hir_node).sty;
let hir_node = lowering::lower_expr(expr);
let ty = &self.tcx.expr_ty_adjusted(&hir_node).sty;
match *ty {
ty::TyStruct(def, _) => {
let sub_span = self.span_utils.span_for_last_ident(path.span);