---

yaml
---
r: 23785
b: refs/heads/master
c: cb53623
h: refs/heads/master
i:
  23783: 7052506
v: v3

Author: Elliott Slaughter

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 244b95490b9f0ca5c7ab38455153b421b0b51818
+refs/heads/master: cb5362334134f1d0d8b2c5557c49ee6534526474
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/gc.rs

@@ -65,6 +65,11 @@ unsafe fn align_to_pointer<T>(ptr: *T) -> *T {
     return unsafe::reinterpret_cast(&ptr);
 }
 
+unsafe fn get_safe_point_count() -> uint {
+    let module_meta = rustrt::rust_gc_metadata();
+    return *module_meta;
+}
+
 type SafePoint = { sp_meta: *Word, fn_meta: *Word };
 
 // Returns the safe point metadata for the given program counter, if
@@ -260,6 +265,11 @@ unsafe fn walk_gc_roots(mem: Memory, sentinel: **Word, visitor: Visitor) {
 
 fn gc() {
     unsafe {
+        // Abort when GC is disabled.
+        if get_safe_point_count() == 0 {
+            return;
+        }
+
         for walk_gc_roots(task_local_heap, ptr::null()) |_root, _tydesc| {
             // FIXME(#2997): Walk roots and mark them.
             io::stdout().write([46]); // .
@@ -288,6 +298,11 @@ fn expect_sentinel() -> bool { false }
 // dead.
 fn cleanup_stack_for_failure() {
     unsafe {
+        // Abort when GC is disabled.
+        if get_safe_point_count() == 0 {
+            return;
+        }
+
         // 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