Skip to content

Commit 8818af5

Browse files
committed
---
yaml --- r: 2388 b: refs/heads/master c: 2d9ccf3 h: refs/heads/master v: v3
1 parent e57f670 commit 8818af5

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 50ac893b00853fa832a0f689b81104bd82e2a9b5
2+
refs/heads/master: 2d9ccf3ae56ce8d403b66a3cb0a560161eb9cb03

trunk/src/comp/front/creader.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,10 @@ fn parse_ty(@pstate st, str_def sd) -> ty.t {
141141
case ('N') {
142142
auto abi;
143143
alt (next(st) as char) {
144-
case ('r') {abi = ast.native_abi_rust;}
145-
case ('c') {abi = ast.native_abi_cdecl;}
146-
case ('l') {abi = ast.native_abi_llvm;}
144+
case ('r') { abi = ast.native_abi_rust; }
145+
case ('i') { abi = ast.native_abi_rust_intrinsic; }
146+
case ('c') { abi = ast.native_abi_cdecl; }
147+
case ('l') { abi = ast.native_abi_llvm; }
147148
}
148149
auto func = parse_ty_fn(st, sd);
149150
ret ty.mk_native_fn(st.tcx,abi,func._0,func._1);

trunk/src/comp/middle/metadata.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ mod Encode {
190190
w.write_char('N');
191191
alt (abi) {
192192
case (ast.native_abi_rust) { w.write_char('r'); }
193+
case (ast.native_abi_rust_intrinsic) {
194+
w.write_char('i');
195+
}
193196
case (ast.native_abi_cdecl) { w.write_char('c'); }
194197
case (ast.native_abi_llvm) { w.write_char('l'); }
195198
}

0 commit comments

Comments
 (0)