From dda6c8cf2f035d23ff3f67c5fc0e805bb18cd0a4 Mon Sep 17 00:00:00 2001
From: Mark-Simulacrum <mark.simulacrum@gmail.com>
Date: Thu, 15 Dec 2016 18:00:19 -0700
Subject: Inline base::malloc_raw_dyn.

Move comment about not unwinding into liballoc.
---
 src/liballoc/heap.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/liballoc')

diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index 12809171b74..a1e32636980 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -127,6 +127,7 @@ pub fn usable_size(size: usize, align: usize) -> usize {
 pub const EMPTY: *mut () = 0x1 as *mut ();
 
 /// The allocator for unique pointers.
+// This function must not unwind. If it does, MIR trans will fail.
 #[cfg(not(test))]
 #[lang = "exchange_malloc"]
 #[inline]
-- 
cgit 1.4.1-3-g733a5