Skip to content

Commit 6281071

Browse files
committed
---
yaml --- r: 50627 b: refs/heads/try c: bcc6c3e h: refs/heads/master i: 50625: 1a9ec50 50623: 8c14c87 v: v3
1 parent a3590c7 commit 6281071

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: fc78b93c413e53a43ec568e3ec1d74d35924093b
5+
refs/heads/try: bcc6c3e3dbf4dc42129b46fba23be4f47c83e809
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/typeck/check/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2303,7 +2303,10 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
23032303
let region_lb = ty::re_scope(expr.id);
23042304
instantiate_path(fcx, pth, tpt, expr.span, expr.id, region_lb);
23052305
}
2306-
ast::expr_inline_asm(*) => { fcx.write_nil(id); }
2306+
ast::expr_inline_asm(*) => {
2307+
fcx.require_unsafe(expr.span, ~"use of inline assembly");
2308+
fcx.write_nil(id);
2309+
}
23072310
ast::expr_mac(_) => tcx.sess.bug(~"unexpanded macro"),
23082311
ast::expr_break(_) => { fcx.write_bot(id); bot = true; }
23092312
ast::expr_again(_) => { fcx.write_bot(id); bot = true; }

0 commit comments

Comments
 (0)