Merge from trunk.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2968b2da85f..7b0c73adbc9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -12,6 +12,8 @@
 
 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.
+
         * eval.c (Qdebug): Now static.
         * lisp.h (Qdebug): Remove decl.  This reverts a part of the
         2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of
diff --git a/src/alloc.c b/src/alloc.c
index 3f7bed571c7..8215cc53cd3 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -993,13 +993,11 @@ lisp_align_malloc (size_t nbytes, enum mem_type type)
   free_ablock = free_ablock->x.next_free;
 
 #if GC_MARK_STACK && !defined GC_MALLOC_CHECK
-  if (val && type != MEM_TYPE_NON_LISP)
+  if (type != MEM_TYPE_NON_LISP)
     mem_insert (val, (char *) val + nbytes, type);
 #endif
 
   MALLOC_UNBLOCK_INPUT;
-  if (!val && nbytes)
-    memory_full ();
 
   eassert (0 == ((uintptr_t) val) % BLOCK_ALIGN);
   return val;