Skip to content

Commit f36a697

Browse files
author
blake2-ppc
committed
---
yaml --- r: 95054 b: refs/heads/dist-snap c: f4d8d8c h: refs/heads/master v: v3
1 parent 5c3452b commit f36a697

File tree

7 files changed

+130
-117
lines changed

7 files changed

+130
-117
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: b88517ec93933ddefe28f793f90b072e9934c198
9+
refs/heads/dist-snap: f4d8d8c12299456ded2f6dd367a5764abe93af8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,10 @@ pub fn cleanup_and_leave(bcx: @mut Block,
14071407
}
14081408
match leave {
14091409
Some(target) => Br(bcx, target),
1410-
None => { Resume(bcx, Load(bcx, bcx.fcx.personality.unwrap())); }
1410+
None => {
1411+
let ll_load = Load(bcx, bcx.fcx.personality.unwrap());
1412+
Resume(bcx, ll_load);
1413+
}
14111414
}
14121415
}
14131416

0 commit comments

Comments
 (0)