---

yaml
---
r: 34847
b: refs/heads/master
c: 7c79801
h: refs/heads/master
i:
  34845: 9d5e05d
  34843: c776439
  34839: dedc21c
  34831: 1b5427a
  34815: e3ac160
v: v3

Author: jdm

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 082d3d51674203d97fd21e6cda6181b4dccfb2e1
+refs/heads/master: 7c7980196c35023631500ef1e44e4833f60a6c64
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/doc/tutorial-macros.md

@@ -2,11 +2,11 @@
 
 # Introduction
 
-Functions are the primary tool that programmers can use to build abstractions.
-Sometimes, however, programmers want to perform abstractions over things that are not
-runtime values. Macros provide a syntactic abstraction. For an example of how this
-can be useful, consider the following two code fragments, which both pattern-match
-on their input and return early in one case, and do nothing otherwise:
+Functions are the primary tool that programmers can use to build
+abstractions. Sometimes, though, programmers want to abstract over
+compile-time, syntactic structures rather than runtime values. For example,
+the following two code fragments both pattern-match on their input and return
+early in one case, doing nothing otherwise:
 
 ~~~~
 # enum t { special_a(uint), special_b(uint) };

trunk/src/rustc/middle/trans/base.rs

@@ -267,7 +267,7 @@ fn malloc_raw_dyn(bcx: block, t: ty::t, heap: heap,
 fn non_gc_box_cast(bcx: block, val: ValueRef) -> ValueRef {
     debug!("non_gc_box_cast");
     add_comment(bcx, ~"non_gc_box_cast");
-    assert(llvm::LLVMGetPointerAddressSpace(val_ty(val)) == gc_box_addrspace);
+    assert(llvm::LLVMGetPointerAddressSpace(val_ty(val)) == gc_box_addrspace || bcx.unreachable);
     let non_gc_t = T_ptr(llvm::LLVMGetElementType(val_ty(val)));
     PointerCast(bcx, val, non_gc_t)
 }

trunk/src/test/run-fail/doublefail.rs

@@ -0,0 +1,5 @@
+//error-pattern:One
+fn main() {
+    fail ~"One";
+    fail ~"Two";
+}