Basic debugging information support

src/comp/driver/rustc.rs

@@ -421,7 +421,8 @@ fn build_session_options(match: getopts::match)
     let libcore = !opt_present(match, "no-core");
     let verify = !opt_present(match, "no-verify");
     let save_temps = opt_present(match, "save-temps");
-    let debuginfo = opt_present(match, "g");
+    let extra_debuginfo = opt_present(match, "xg");
+    let debuginfo = opt_present(match, "g") || extra_debuginfo;
     let stats = opt_present(match, "stats");
     let time_passes = opt_present(match, "time-passes");
     let time_llvm_passes = opt_present(match, "time-llvm-passes");
@@ -468,6 +469,7 @@ fn build_session_options(match: getopts::match)
           libcore: libcore,
           optimize: opt_level,
           debuginfo: debuginfo,
+          extra_debuginfo: extra_debuginfo,
           verify: verify,
           save_temps: save_temps,
           stats: stats,
@@ -487,7 +489,7 @@ fn build_session_options(match: getopts::match)
     ret sopts;
 }
 
-fn build_session(sopts: @session::options) -> session::session {
+fn build_session(sopts: @session::options, input: str) -> session::session {
     let target_cfg = build_target_config(sopts);
     let cstore = cstore::mk_cstore();
     let filesearch = filesearch::mk_filesearch(
@@ -496,7 +498,7 @@ fn build_session(sopts: @session::options) -> session::session {
         sopts.addl_lib_search_paths);
     ret session::session(target_cfg, sopts, cstore,
                          @{cm: codemap::new_codemap(), mutable next_id: 1},
-                         none, 0u, filesearch, false);
+                         none, 0u, filesearch, false, fs::dirname(input));
 }
 
 fn parse_pretty(sess: session::session, &&name: str) -> pp_mode {
@@ -516,7 +518,7 @@ fn opts() -> [getopts::opt] {
          optflag("emit-llvm"), optflagopt("pretty"),
          optflag("ls"), optflag("parse-only"), optflag("no-trans"),
          optflag("O"), optopt("opt-level"), optmulti("L"), optflag("S"),
-         optopt("o"), optopt("out-dir"),
+         optopt("o"), optopt("out-dir"), optflag("xg"),
          optflag("c"), optflag("g"), optflag("save-temps"),
          optopt("sysroot"), optopt("target"), optflag("stats"),
          optflag("time-passes"), optflag("time-llvm-passes"),
@@ -642,7 +644,7 @@ fn main(args: [str]) {
     };
 
     let sopts = build_session_options(match);
-    let sess = build_session(sopts);
+    let sess = build_session(sopts, ifile);
     let odir = getopts::opt_maybe_str(match, "out-dir");
     let ofile = getopts::opt_maybe_str(match, "o");
     let cfg = build_configuration(sess, binary, ifile);
@@ -674,7 +676,7 @@ mod test {
               ok(m) { m }
             };
         let sessopts = build_session_options(match);
-        let sess = build_session(sessopts);
+        let sess = build_session(sessopts, "");
         let cfg = build_configuration(sess, "whatever", "whatever");
         assert (attr::contains_name(cfg, "test"));
     }
@@ -688,7 +690,7 @@ mod test {
               ok(m) { m }
             };
         let sessopts = build_session_options(match);
-        let sess = build_session(sessopts);
+        let sess = build_session(sessopts, "");
         let cfg = build_configuration(sess, "whatever", "whatever");
         let test_items = attr::find_meta_items_by_name(cfg, "test");
         assert (vec::len(test_items) == 1u);

src/comp/driver/session.rs

@@ -31,6 +31,7 @@ type options =
      libcore: bool,
      optimize: uint,
      debuginfo: bool,
+     extra_debuginfo: bool,
      verify: bool,
      save_temps: bool,
      stats: bool,
@@ -59,7 +60,8 @@ obj session(targ_cfg: @config,
             mutable main_fn: option::t<node_id>,
             mutable err_count: uint,
             filesearch: filesearch::filesearch,
-            mutable building_library: bool) {
+            mutable building_library: bool,
+            working_dir: str) {
     fn get_targ_cfg() -> @config { ret targ_cfg; }
     fn get_opts() -> @options { ret opts; }
     fn get_cstore() -> metadata::cstore::cstore { cstore }
@@ -122,6 +124,9 @@ obj session(targ_cfg: @config,
     fn set_building_library(crate: @ast::crate) {
         building_library = session::building_library(opts.crate_type, crate);
     }
+    fn get_working_dir() -> str {
+        ret working_dir;
+    }
 }
 
 fn building_library(req_crate_type: crate_type, crate: @ast::crate) -> bool {

src/comp/lib/llvm.rs

@@ -234,9 +234,11 @@ native mod llvm {
     /* Operations on other types */
     fn LLVMVoidTypeInContext(C: ContextRef) -> TypeRef;
     fn LLVMLabelTypeInContext(C: ContextRef) -> TypeRef;
+    fn LLVMMetadataTypeInContext(C: ContextRef) -> TypeRef;
 
     fn LLVMVoidType() -> TypeRef;
     fn LLVMLabelType() -> TypeRef;
+    fn LLVMMetadataType() -> TypeRef;
 
     /* Operations on all values */
     fn LLVMTypeOf(Val: ValueRef) -> TypeRef;
@@ -256,6 +258,7 @@ native mod llvm {
 
     /* Operations on Users */
     fn LLVMGetOperand(Val: ValueRef, Index: uint) -> ValueRef;
+    fn LLVMSetOperand(Val: ValueRef, Index: uint, Op: ValueRef);
 
     /* Operations on constants of any type */
     fn LLVMConstNull(Ty: TypeRef) -> ValueRef;
@@ -275,6 +278,8 @@ native mod llvm {
     fn LLVMMDNodeInContext(C: ContextRef, Vals: *ValueRef, Count: uint) ->
        ValueRef;
     fn LLVMMDNode(Vals: *ValueRef, Count: uint) -> ValueRef;
+    fn LLVMAddNamedMetadataOperand(M: ModuleRef, Str: sbuf, SLen: uint,
+                                   Val: ValueRef);
 
     /* Operations on scalar constants */
     fn LLVMConstInt(IntTy: TypeRef, N: ULongLong, SignExtend: Bool) ->

src/comp/middle/ast_map.rs

@@ -7,13 +7,15 @@ import syntax::{visit, codemap};
 tag ast_node {
     node_item(@item);
     node_obj_ctor(@item);
+    node_obj_method(@method);
     node_native_item(@native_item);
     node_method(@method);
     node_expr(@expr);
     // Locals are numbered, because the alias analysis needs to know in which
     // order they are introduced.
     node_arg(arg, uint);
     node_local(uint);
+    node_res_ctor(@item);
 }
 
 type map = std::map::hashmap<node_id, ast_node>;
@@ -63,10 +65,19 @@ fn map_arm(cx: ctx, arm: arm) {
 fn map_item(cx: ctx, i: @item) {
     cx.map.insert(i.id, node_item(i));
     alt i.node {
-      item_obj(_, _, ctor_id) { cx.map.insert(ctor_id, node_obj_ctor(i)); }
+      item_obj(ob, _, ctor_id) {
+        cx.map.insert(ctor_id, node_obj_ctor(i));
+        for m in ob.methods {
+            cx.map.insert(m.node.id, node_obj_method(m));
+        }
+      }
       item_impl(_, _, ms) {
         for m in ms { cx.map.insert(m.node.id, node_method(m)); }
       }
+      item_res(_, dtor_id, _, ctor_id) {
+        cx.map.insert(ctor_id, node_res_ctor(i));
+        cx.map.insert(dtor_id, node_item(i));
+      }
       _ { }
     }
 }