---

yaml
---
r: 32441
b: refs/heads/dist-snap
c: 578b036
h: refs/heads/master
i:
  32439: 2ae91fc
v: v3

Author: Elliott Slaughter

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 7823ad8586f52bcd6277965277bd15ff15674219
+refs/heads/dist-snap: 578b036f9b0415852aae0af9286ff53630fa1c56
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/gc.rs

@@ -167,18 +167,33 @@ fn RootSet() -> RootSet {
     LinearMap()
 }
 
+#[cfg(gc)]
+fn expect_sentinel() -> bool { true }
+
+#[cfg(nogc)]
+fn expect_sentinel() -> bool { false }
+
 // This should only be called from fail, as it will drop the roots
 // which are *live* on the stack, rather than dropping those that are
 // dead.
 fn cleanup_stack_for_failure() {
     unsafe {
-        // Leave a sentinel on the stack to mark the current
-        // frame. The stack walker will ignore any frames above the
-        // sentinel, thus avoiding collecting any memory being used by
-        // the stack walker itself.
+        // Leave a sentinel on the stack to mark the current frame. The
+        // stack walker will ignore any frames above the sentinel, thus
+        // avoiding collecting any memory being used by the stack walker
+        // itself.
+        //
+        // However, when core itself is not compiled with GC, then none of
+        // the functions in core will have GC metadata, which means we
+        // won't be able to find the sentinel root on the stack. In this
+        // case, we can safely skip the sentinel since we won't find our
+        // own stack roots on the stack anyway.
         let sentinel_box = ~0;
-        let sentinel: **Word =
-            unsafe::reinterpret_cast(&ptr::addr_of(sentinel_box));
+        let sentinel: **Word = if expect_sentinel() {
+            unsafe::reinterpret_cast(&ptr::addr_of(sentinel_box))
+        } else {
+            ptr::null()
+        };
 
         let mut roots = ~RootSet();
         for walk_gc_roots(need_cleanup, sentinel) |root, tydesc| {