auto merge of #11401 : michaelwoerister/rust/issue11322, r=alexcrichton
`expand_include_str()` in libsyntax seems to have corrupted the CodeMap by always setting the BytePos of any included files to zero. It now uses `CodeMap::new_filemap()` which should set everything properly. This should fix issue #11322 but I don't want to close it before I have confirmation from the reporters that the problem is indeed fixed.
This commit is contained in:
commit
97005c0068
|
@ -19,7 +19,6 @@ use parse;
|
|||
use parse::token::{get_ident_interner};
|
||||
use print::pprust;
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::io;
|
||||
use std::io::File;
|
||||
use std::str;
|
||||
|
@ -105,20 +104,14 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::token_tree])
|
|||
Ok(bytes) => bytes,
|
||||
};
|
||||
match str::from_utf8_owned_opt(bytes) {
|
||||
Some(s) => {
|
||||
let s = s.to_managed();
|
||||
Some(src) => {
|
||||
// Add this input file to the code map to make it available as
|
||||
// dependency information
|
||||
let mut files = cx.parse_sess.cm.files.borrow_mut();
|
||||
files.get().push(@codemap::FileMap {
|
||||
name: file.display().to_str().to_managed(),
|
||||
substr: codemap::FssNone,
|
||||
src: s,
|
||||
start_pos: codemap::BytePos(0),
|
||||
lines: RefCell::new(~[]),
|
||||
multibyte_chars: RefCell::new(~[]),
|
||||
});
|
||||
base::MRExpr(cx.expr_str(sp, s))
|
||||
let src = src.to_managed();
|
||||
let filename = file.display().to_str().to_managed();
|
||||
cx.parse_sess.cm.new_filemap(filename, src);
|
||||
|
||||
base::MRExpr(cx.expr_str(sp, src))
|
||||
}
|
||||
None => {
|
||||
cx.span_fatal(sp, format!("{} wasn't a utf-8 file", file.display()));
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
// Copyright 2013 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.
|
||||
|
||||
// xfail-android: FIXME(#10381)
|
||||
|
||||
// compile-flags:-Z extra-debug-info
|
||||
// debugger:rbreak zzz
|
||||
// debugger:run
|
||||
// debugger:finish
|
||||
// debugger:print string1
|
||||
// check:$1 = [...]"some text to include in another file as string 1", length = 48}
|
||||
// debugger:print string2
|
||||
// check:$2 = [...]"some text to include in another file as string 2", length = 48}
|
||||
// debugger:print string3
|
||||
// check:$3 = [...]"some text to include in another file as string 3", length = 48}
|
||||
// debugger:continue
|
||||
|
||||
#[allow(unused_variable)];
|
||||
|
||||
// This test case makes sure that debug info does not ICE when include_str is
|
||||
// used multiple times (see issue #11322).
|
||||
|
||||
fn main() {
|
||||
let string1 = include_str!("text-to-include-1.txt");
|
||||
let string2 = include_str!("text-to-include-2.txt");
|
||||
let string3 = include_str!("text-to-include-3.txt");
|
||||
zzz();
|
||||
}
|
||||
|
||||
fn zzz() {()}
|
|
@ -0,0 +1 @@
|
|||
some text to include in another file as string 1
|
|
@ -0,0 +1 @@
|
|||
some text to include in another file as string 2
|
|
@ -0,0 +1 @@
|
|||
some text to include in another file as string 3
|
Loading…
Reference in New Issue