Skip to content

Commit 7719814

Browse files
author
blake2-ppc
committed
---
yaml --- r: 82772 b: refs/heads/auto c: f4d8d8c h: refs/heads/master v: v3
1 parent a31a47b commit 7719814

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: b88517ec93933ddefe28f793f90b072e9934c198
16+
refs/heads/auto: f4d8d8c12299456ded2f6dd367a5764abe93af8d
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)