---

yaml
---
r: 85452
b: refs/heads/dist-snap
c: 6c49c2d
h: refs/heads/master
v: v3

Author: michaelwoerister

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 907633b1bfc757cf9a415e4573098f58881469f2
+refs/heads/dist-snap: 6c49c2df763f8cf1817bc651582deba8bb35a29d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/debuginfo.rs

@@ -51,7 +51,7 @@ This file consists of three conceptual sections:
 
 use driver::session;
 use lib::llvm::llvm;
-use lib::llvm::{ModuleRef, ContextRef};
+use lib::llvm::{ModuleRef, ContextRef, ValueRef};
 use lib::llvm::debuginfo::*;
 use middle::trans::common::*;
 use middle::trans::machine;
@@ -97,7 +97,7 @@ pub struct DebugContext {
     priv builder: DIBuilderRef,
     priv curr_loc: (uint, uint),
     priv created_files: HashMap<~str, DIFile>,
-    priv created_functions: HashMap<ast::NodeId, DISubprogram>,
+    priv created_functions: HashMap<FunctionCacheKey, DISubprogram>,
     priv created_blocks: HashMap<ast::NodeId, DILexicalBlock>,
     priv created_types: HashMap<uint, DIType>
 }
@@ -121,6 +121,19 @@ impl DebugContext {
     }
 }
 
+#[deriving(Eq,IterBytes)]
+struct FunctionCacheKey {
+    // Use the address of the llvm function (FunctionContext::llfn) as key for the cache. This
+    // nicely takes care of monomorphization, where two specializations will have the same
+    // ast::NodeId but different llvm functions (each needing its own debug description).
+    priv llfn: ValueRef
+}
+
+impl FunctionCacheKey {
+    fn for_function_context(fcx: &FunctionContext) -> FunctionCacheKey {
+        FunctionCacheKey { llfn: fcx.llfn }
+    }
+}
 
 pub struct FunctionDebugContext {
     priv scope_map: HashMap<ast::NodeId, DIScope>,
@@ -269,13 +282,22 @@ pub fn update_source_pos(fcx: &FunctionContext,
 /// The return value should be ignored if called from outside of the debuginfo module.
 pub fn create_function_metadata(fcx: &mut FunctionContext) -> DISubprogram {
     let cx = fcx.ccx;
+    let cache_key = FunctionCacheKey::for_function_context(fcx);
+
+    match dbg_cx(cx).created_functions.find_copy(&cache_key) {
+        Some(fn_metadata) => {
+            assert!(fcx.debug_context.is_some());
+            return fn_metadata;
+        }
+        None => { /* fallthrough */}
+    }
 
     let fnitem = cx.tcx.items.get_copy(&fcx.id);
-    let (ident, fn_decl, id, generics) = match fnitem {
+    let (ident, fn_decl, generics, span) = match fnitem {
         ast_map::node_item(ref item, _) => {
             match item.node {
                 ast::item_fn(ref fn_decl, _, _, ref generics, _) => {
-                    (item.ident, ty, item.id, Some(generics))
+                    (item.ident, fn_decl, Some(generics), item.span)
                 }
                 _ => fcx.ccx.sess.span_bug(item.span,
                                            "create_function_metadata: item bound to non-function")
@@ -284,23 +306,24 @@ pub fn create_function_metadata(fcx: &mut FunctionContext) -> DISubprogram {
         ast_map::node_method(
             @ast::method {
                 decl: ref fn_decl,
-                id: id,
                 ident: ident,
                 generics: ref generics,
+                span: span,
                 _
             },
             _,
             _) => {
-            (ident, fn_decl, id, Some(generics))
+            (ident, fn_decl, Some(generics), span)
         }
         ast_map::node_expr(ref expr) => {
             match expr.node {
                 ast::expr_fn_block(ref fn_decl, _) => {
                     let name = gensym_name("fn");
-                    (name, fn_decl, expr.id,
+                    (name, fn_decl,
                         // This is not quite right. It should actually inherit the generics of the
                         // enclosing function.
-                        None)
+                        None,
+                        expr.span)
                 }
                 _ => fcx.ccx.sess.span_bug(expr.span,
                         "create_function_metadata: expected an expr_fn_block here")
@@ -310,126 +333,148 @@ pub fn create_function_metadata(fcx: &mut FunctionContext) -> DISubprogram {
             @ast::provided(
                 @ast::method {
                     decl: ref fn_decl,
-                    id: id,
                     ident: ident,
                     generics: ref generics,
+                    span: span,
                     _
                 }),
             _,
             _) => {
-            (ident, fn_decl, id, Some(generics))
+            (ident, fn_decl, Some(generics), span)
         }
         _ => fcx.ccx.sess.bug(fmt!("create_function_metadata: unexpected sort of node: %?", fnitem))
     };
 
-    match dbg_cx(cx).created_functions.find_copy(&id) {
-        Some(fn_metadata) => return fn_metadata,
-        None => ()
-    }
-
-    let span = match fcx.span {
-        Some(value) => value,
-        None => codemap::dummy_sp()
-    };
-
     debug!("create_function_metadata: %s, %s",
            cx.sess.str_of(ident),
            cx.sess.codemap.span_to_str(span));
 
     let loc = span_start(cx, span);
     let file_metadata = file_metadata(cx, loc.file.name);
 
-    let return_type_metadata = if cx.sess.opts.extra_debuginfo {
+    let function_type_metadata = unsafe {
+        let fn_signature = get_function_signature(fcx, fn_decl);
+        llvm::LLVMDIBuilderCreateSubroutineType(DIB(cx), file_metadata, fn_signature)
+    };
+
+    let mut function_name = cx.sess.str_of(ident).to_owned();
+    let template_parameters = get_template_parameters(fcx,
+                                                      generics,
+                                                      file_metadata,
+                                                      span,
+                                                      &mut function_name);
+
+    let fn_metadata = do function_name.to_c_str().with_ref |function_name| {
+        unsafe {
+            llvm::LLVMDIBuilderCreateFunction(
+                DIB(cx),
+                file_metadata,
+                function_name,
+                function_name,
+                file_metadata,
+                loc.line as c_uint,
+                function_type_metadata,
+                false,
+                true,
+                loc.line as c_uint,
+                FlagPrototyped as c_uint,
+                cx.sess.opts.optimize != session::No,
+                fcx.llfn,
+                template_parameters,
+                ptr::null())
+        }
+    };
+
+    dbg_cx(cx).created_functions.insert(cache_key, fn_metadata);
+
+    // Initialize fn debug context (including scope map)
+    {
+        assert!(fcx.debug_context.is_none());
+
+        let mut fn_debug_context = ~FunctionDebugContext::new();
+        let entry_block_id = fcx.entry_bcx.get_ref().node_info.get_ref().id;
+        let entry_block = cx.tcx.items.get(&entry_block_id);
+
+        match *entry_block {
+            ast_map::node_block(ref block) => {
+                let scope_map = &mut fn_debug_context.scope_map;
+                let arg_pats = do fn_decl.inputs.map |arg_ref| { arg_ref.pat };
+
+                populate_scope_map(cx, arg_pats, block, fn_metadata, scope_map);
+            }
+            _ => cx.sess.span_bug(span,
+                    fmt!("debuginfo::create_function_metadata() - \
+                         FunctionContext::entry_bcx::node_info points to wrong type of ast_map entry. \
+                         Expected: ast_map::node_block, actual: %?", *entry_block))
+        }
+
+        fcx.debug_context = Some(fn_debug_context);
+    }
+
+    return fn_metadata;
+
+    fn get_function_signature(fcx: &FunctionContext, fn_decl: &ast::fn_decl) -> DIArray {
+        let cx = fcx.ccx;
+
+        if !cx.sess.opts.extra_debuginfo {
+            return create_DIArray(DIB(cx), []);
+        }
+
+        let mut signature = vec::with_capacity(fn_decl.inputs.len() + 1);
+
+        // Return type -- llvm::DIBuilder wants this at index 0
         match fn_decl.output.node {
-            ast::ty_nil => ptr::null(),
+            ast::ty_nil => {
+                signature.push(ptr::null());
+            }
             _ => {
-                let return_type = ty::node_id_to_type(cx.tcx, id);
+                let return_type = ty::node_id_to_type(cx.tcx, fcx.id);
                 let return_type = match fcx.param_substs {
                     None => return_type,
                     Some(substs) => {
                         ty::subst_tps(cx.tcx, substs.tys, substs.self_ty, return_type)
                     }
                 };
 
-                type_metadata(cx, return_type, ret_ty.span)
+                signature.push(type_metadata(cx, return_type, codemap::dummy_sp()));
             }
         }
-    } else {
-        ptr::null()
-    };
 
-    let fn_ty = unsafe {
-        llvm::LLVMDIBuilderCreateSubroutineType(
-            DIB(cx),
-            file_metadata,
-            create_DIArray(DIB(cx), [return_type_metadata]))
-    };
-
-    let template_parameters: DIArray = get_template_parameters(cx, fcx, generics, file_metadata, span);
-
-    let fn_metadata =
-        do cx.sess.str_of(ident).with_c_str |name| {
-        do cx.sess.str_of(ident).with_c_str |linkage| {
-            unsafe {
-                llvm::LLVMDIBuilderCreateFunction(
-                    DIB(cx),
-                    file_metadata,
-                    name,
-                    linkage,
-                    file_metadata,
-                    loc.line as c_uint,
-                    fn_ty,
-                    false,
-                    true,
-                    loc.line as c_uint,
-                    FlagPrototyped as c_uint,
-                    cx.sess.opts.optimize != session::No,
-                    fcx.llfn,
-                    template_parameters,
-                    ptr::null())
-            }
-        }};
-
-    assert!(fcx.debug_context.is_none());
-
-    let mut fn_debug_context = ~FunctionDebugContext::new();
-    let entry_block_id = fcx.entry_bcx.get_ref().node_info.get_ref().id;
-    let entry_block = cx.tcx.items.get(&entry_block_id);
-
-    match *entry_block {
-        ast_map::node_block(ref block) => {
-            let scope_map = &mut fn_debug_context.scope_map;
-            let arg_pats = do fn_decl.inputs.map |arg_ref| { arg_ref.pat };
+        // arguments types
+        for arg in fn_decl.inputs.iter() {
+            let arg_type = ty::node_id_to_type(cx.tcx, arg.pat.id);
+            let arg_type = match fcx.param_substs {
+                None => arg_type,
+                Some(substs) => {
+                    ty::subst_tps(cx.tcx, substs.tys, substs.self_ty, arg_type)
+                }
+            };
 
-            populate_scope_map(cx, arg_pats, block, fn_metadata, scope_map);
+            signature.push(type_metadata(cx, arg_type, codemap::dummy_sp()));
         }
-        _ => cx.sess.span_bug(span,
-                fmt!("debuginfo::create_function_metadata() - \
-                     FunctionContext::entry_bcx::node_info points to wrong type of ast_map entry. \
-                     Expected: ast_map::node_block, actual: %?", *entry_block))
-    }
-
-    fcx.debug_context = Some(fn_debug_context);
 
-    dbg_cx(cx).created_functions.insert(id, fn_metadata);
-    return fn_metadata;
+        return create_DIArray(DIB(cx), signature);
+    }
 
-    fn get_template_parameters(cx: &mut CrateContext,
-                               fcx: &FunctionContext,
+    fn get_template_parameters(fcx: &FunctionContext,
                                generics: Option<&ast::Generics>,
                                file_metadata: DIFile,
-                               span: span) -> DIArray {
+                               span: span,
+                               name_to_append_suffix_to: &mut ~str)
+                            -> DIArray {
         // Normalize cases
         let generics = match generics {
             Some(generics_ref) if generics_ref.is_type_parameterized() => Some(generics_ref),
             _ => None
         };
 
+        let cx = fcx.ccx;
+
         match generics {
             None => {
                 if (fcx.param_substs.is_some()) {
                     cx.sess.span_bug(span, "debuginfo::create_function_metadata() - \
-                        Mismatch between ast::Generics and FunctionContext::param_substs 111");
+                        Mismatch between ast::Generics and FunctionContext::param_substs");
                 }
 
                 return ptr::null();
@@ -442,22 +487,31 @@ pub fn create_function_metadata(fcx: &mut FunctionContext) -> DISubprogram {
                     }
                     None => {
                         cx.sess.span_bug(span, "debuginfo::create_function_metadata() - \
-                            Mismatch between ast::Generics and FunctionContext::param_substs 222");
+                            Mismatch between ast::Generics and FunctionContext::param_substs");
                     }
                 };
 
+                name_to_append_suffix_to.push_char('<');
+
                 let template_params: ~[DIDescriptor] = do generics
                     .ty_params
                     .iter()
                     .enumerate()
-                    .transform |(index, &ast::TyParam{ ident: ident, _ })| {
+                    .map |(index, &ast::TyParam{ ident: ident, _ })| {
 
                         let actual_type = actual_types[index];
                         let actual_type_metadata = type_metadata(cx,
                                                                  actual_type,
                                                                  codemap::dummy_sp());
 
-                        do cx.sess.str_of(ident).as_c_str |name| {
+                        // Add actual type name to <...> clause of function name
+                        let actual_type_name = ty_to_str(cx.tcx, actual_type);
+                        name_to_append_suffix_to.push_str(actual_type_name);
+                        if index != generics.ty_params.len() - 1 {
+                            name_to_append_suffix_to.push_str(", ");
+                        }
+
+                        do cx.sess.str_of(ident).to_c_str().with_ref |name| {
                             unsafe {
                                 llvm::LLVMDIBuilderCreateTemplateTypeParameter(
                                     DIB(cx),
@@ -471,6 +525,8 @@ pub fn create_function_metadata(fcx: &mut FunctionContext) -> DISubprogram {
                         }
                     }.collect();
 
+                name_to_append_suffix_to.push_char('>');
+
                 return create_DIArray(DIB(cx), template_params);
             }
         }

branches/dist-snap/src/test/debug-info/generic-function.rs

@@ -32,6 +32,21 @@
 // check:$6 = {{3.5, 4}, {4, 3.5}}
 // debugger:continue
 
+// debugger:finish
+// debugger:print *t0
+// check:$7 = 5
+// debugger:print *t1
+// check:$8 = {a = 6, b = 7.5}
+// debugger:print ret
+// check:$9 = {{5, {a = 6, b = 7.5}}, {{a = 6, b = 7.5}, 5}}
+// debugger:continue
+
+#[deriving(Clone)]
+struct Struct {
+    a: int,
+    b: float
+}
+
 fn dup_tup<T0: Clone, T1: Clone>(t0: &T0, t1: &T1) -> ((T0, T1), (T1, T0)) {
     let ret = ((t0.clone(), t1.clone()), (t1.clone(), t0.clone()));
     zzz();
@@ -42,7 +57,7 @@ fn main() {
 
     let _ = dup_tup(&1, &2.5);
     let _ = dup_tup(&3.5, &4_u16);
-
+    let _ = dup_tup(&5, &Struct { a: 6, b: 7.5 });
 }
 
 fn zzz() {()}