From 702fe5cdac4f6852689c1e74c3ca95af249f4285 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 17 Aug 2011 13:58:49 -0700
Subject: rustc: Run obstack cleanups at the end of each function

---
 src/rt/rust_obstack.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/rt/rust_obstack.cpp')

diff --git a/src/rt/rust_obstack.cpp b/src/rt/rust_obstack.cpp
index 9300ec49073..5ec996f4e32 100644
--- a/src/rt/rust_obstack.cpp
+++ b/src/rt/rust_obstack.cpp
@@ -44,7 +44,7 @@ rust_obstack_chunk::free(void *ptr) {
     uint8_t *p = (uint8_t *)ptr;
     if (p < data || p >= data + size)
         return false;
-    assert(p < data + alen);
+    assert(p <= data + alen);
     alen = (size_t)(p - data);
     return true;
 }
@@ -71,7 +71,8 @@ rust_obstack::alloc(size_t len) {
     if (!chunk)
         return alloc_new(len);
     void *ptr = chunk->alloc(len);
-    return ptr ? ptr : alloc_new(len);
+    ptr = ptr ? ptr : alloc_new(len);
+    return ptr;
 }
 
 void
-- 
cgit 1.4.1-3-g733a5