Skip to content

Commit c7cf30e

Browse files
michaelwoeristernikomatsakis
authored andcommitted
---
yaml --- r: 273551 b: refs/heads/beta c: 5027a79 h: refs/heads/master i: 273549: 0e95814 273547: 6c439cd 273543: 36f99e3 273535: 8f913f2
1 parent 83e0879 commit c7cf30e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 6fdeecf62f413171ad9762bb42b2d794eb4f4967
26+
refs/heads/beta: 5027a79279353ca86d7ebb1f3fb9cc03361b84b4
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_trans/trans/inline.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ fn instantiate_inline(ccx: &CrateContext, fn_id: DefId) -> Option<DefId> {
9797
for (ast_v, ty_v) in ast_vs.iter().zip(ty_vs.iter()) {
9898
if ty_v.did == fn_id { my_id = ast_v.node.data.id(); }
9999
ccx.external().borrow_mut().insert(ty_v.did, Some(ast_v.node.data.id()));
100+
ccx.external_srcs().borrow_mut().insert(ast_v.node.data.id(), ty_v.did);
100101
}
101102
}
102103
hir::ItemStruct(ref struct_def, _) => {
@@ -105,6 +106,7 @@ fn instantiate_inline(ccx: &CrateContext, fn_id: DefId) -> Option<DefId> {
105106
non-tuple struct")
106107
} else {
107108
ccx.external().borrow_mut().insert(fn_id, Some(struct_def.id()));
109+
ccx.external_srcs().borrow_mut().insert(struct_def.id(), fn_id);
108110
my_id = struct_def.id();
109111
}
110112
}

0 commit comments

Comments
 (0)