Skip to content

Commit 23377ea

Browse files
committed
---
yaml --- r: 148990 b: refs/heads/try2 c: 285c25f h: refs/heads/master v: v3
1 parent 5fad516 commit 23377ea

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 1dd18801216b26595a7b374e5dc8ee32eb577954
8+
refs/heads/try2: 285c25f7f4fd5e824da6b6d670a141535f948750
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/datum.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,10 @@ fn load<'a>(bcx: &'a Block<'a>, llptr: ValueRef, ty: ty::t) -> ValueRef {
546546
C_undef(type_of::type_of(bcx.ccx(), ty))
547547
} else if ty::type_is_bool(ty) {
548548
LoadRangeAssert(bcx, llptr, 0, 2, lib::llvm::True)
549+
} else if ty::type_is_char(ty) {
550+
// a char is a unicode codepoint, and so takes values from 0
551+
// to 0x10FFFF inclusive only.
552+
LoadRangeAssert(bcx, llptr, 0, 0x10FFFF + 1, lib::llvm::False)
549553
} else {
550554
Load(bcx, llptr)
551555
}

0 commit comments

Comments
 (0)