Fix CodeMap issue in expand_include_str()

5 files changed, 46 insertions, 13 deletions

diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
index 57da01ccad0..fae3f013f91 100644
--- a/src/libsyntax/ext/source_util.rs
+++ b/src/libsyntax/ext/source_util.rs
@@ -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()));
diff --git a/src/test/debug-info/include_string.rs b/src/test/debug-info/include_string.rs
new file mode 100644
index 00000000000..a13dde22710
--- /dev/null
+++ b/src/test/debug-info/include_string.rs
@@ -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() {()}
diff --git a/src/test/debug-info/text-to-include-1.txt b/src/test/debug-info/text-to-include-1.txt
new file mode 100644
index 00000000000..ba055272a3f
--- /dev/null
+++ b/src/test/debug-info/text-to-include-1.txt
@@ -0,0 +1 @@
+some text to include in another file as string 1
\ No newline at end of file
diff --git a/src/test/debug-info/text-to-include-2.txt b/src/test/debug-info/text-to-include-2.txt
new file mode 100644
index 00000000000..a2caa5e7141
--- /dev/null
+++ b/src/test/debug-info/text-to-include-2.txt
@@ -0,0 +1 @@
+some text to include in another file as string 2
\ No newline at end of file
diff --git a/src/test/debug-info/text-to-include-3.txt b/src/test/debug-info/text-to-include-3.txt
new file mode 100644
index 00000000000..9933e6c1b0b
--- /dev/null
+++ b/src/test/debug-info/text-to-include-3.txt
@@ -0,0 +1 @@
+some text to include in another file as string 3
\ No newline at end of file