---

yaml
---
r: 235591
b: refs/heads/stable
c: 47128b8
h: refs/heads/master
i:
  235589: bf2d8c8
  235587: 5245636
  235583: 2693e47
v: v3

Author: dotdash

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 1373c4fcf21930a22150210200bdc14f5f935b3c
+refs/heads/stable: 47128b8c7ed38b28e1e7788bc9d5197959d450e8
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_trans/trans/debuginfo/mod.rs

@@ -30,7 +30,7 @@ use middle::subst::{self, Substs};
 use rustc::ast_map;
 use trans::common::{NodeIdAndSpan, CrateContext, FunctionContext, Block};
 use trans;
-use trans::monomorphize;
+use trans::{monomorphize, type_of};
 use middle::ty::{self, Ty};
 use session::config::{self, FullDebugInfo, LimitedDebugInfo, NoDebugInfo};
 use util::nodemap::{NodeMap, FnvHashMap, FnvHashSet};
@@ -41,7 +41,7 @@ use std::ffi::CString;
 use std::ptr;
 use std::rc::Rc;
 use syntax::codemap::{Span, Pos};
-use syntax::{ast, codemap, ast_util};
+use syntax::{abi, ast, codemap, ast_util};
 use syntax::attr::IntType;
 use syntax::parse::token::{self, special_idents};
 
@@ -412,12 +412,13 @@ pub fn create_function_debug_context<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
         assert_type_for_node_id(cx, fn_ast_id, error_reporting_span);
         let fn_type = cx.tcx().node_id_to_type(fn_ast_id);
 
-        let sig = match fn_type.sty {
+        let (sig, abi) = match fn_type.sty {
             ty::TyBareFn(_, ref barefnty) => {
-                cx.tcx().erase_late_bound_regions(&barefnty.sig)
+                (cx.tcx().erase_late_bound_regions(&barefnty.sig), barefnty.abi)
             }
             ty::TyClosure(def_id, substs) => {
-                cx.tcx().erase_late_bound_regions(&cx.tcx().closure_type(def_id, substs).sig)
+                let closure_type = cx.tcx().closure_type(def_id, substs);
+                (cx.tcx().erase_late_bound_regions(&closure_type.sig), closure_type.abi)
             }
 
             _ => cx.sess().bug("get_function_metdata: Expected a function type!")
@@ -435,8 +436,14 @@ pub fn create_function_debug_context<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
             ty::FnDiverging => diverging_type_metadata(cx)
         });
 
+        let inputs = &if abi == abi::RustCall {
+            type_of::untuple_arguments(cx, &sig.inputs)
+        } else {
+            sig.inputs
+        };
+
         // Arguments types
-        for &argument_type in &sig.inputs {
+        for &argument_type in inputs {
             signature.push(type_metadata(cx, argument_type, codemap::DUMMY_SP));
         }