From 0025827eacdf82449ab4ba2603c253e8ab7b8c3c Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Fri, 1 Aug 2014 18:30:24 +0400 Subject: [PATCH] Fixes: JERRY_NVALGRIND effect was inverted; also a block was marked as inaccessible too early. --- src/liballocator/mem-heap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/liballocator/mem-heap.c b/src/liballocator/mem-heap.c index db41b3c5b..56dadd17c 100644 --- a/src/liballocator/mem-heap.c +++ b/src/liballocator/mem-heap.c @@ -33,13 +33,6 @@ * Valgrind-related options and headers */ #ifndef JERRY_NVALGRIND -# define VALGRIND_NOACCESS_STRUCT( s) -# define VALGRIND_UNDEFINED_STRUCT( s) -# define VALGRIND_DEFINED_STRUCT( s) -# define VALGRIND_NOACCESS_SPACE( p, s) -# define VALGRIND_UNDEFINED_SPACE( p, s) -# define VALGRIND_DEFINED_SPACET( p, s) -#else /* !JERRRY_NVALGRIND */ # include "memcheck.h" # define VALGRIND_NOACCESS_STRUCT( s) VALGRIND_MAKE_MEM_NOACCESS( ( s ), sizeof( *( s ) ) ) @@ -48,6 +41,13 @@ # define VALGRIND_NOACCESS_SPACE( p, s) VALGRIND_MAKE_MEM_NOACCESS( ( p ), ( s ) ) # define VALGRIND_UNDEFINED_SPACE( p, s) VALGRIND_MAKE_MEM_UNDEFINED( ( p ), ( s ) ) # define VALGRIND_DEFINED_SPACET( p, s) VALGRIND_MAKE_MEM_DEFINED( ( p ), ( s ) ) +#else /* !JERRRY_NVALGRIND */ +# define VALGRIND_NOACCESS_STRUCT( s) +# define VALGRIND_UNDEFINED_STRUCT( s) +# define VALGRIND_DEFINED_STRUCT( s) +# define VALGRIND_NOACCESS_SPACE( p, s) +# define VALGRIND_UNDEFINED_SPACE( p, s) +# define VALGRIND_DEFINED_SPACET( p, s) #endif /* !JERRY_NVALGRIND */ /** @@ -253,9 +253,9 @@ mem_init_block_header( uint8_t *first_chunk_p, /**< address of the first block_header_p->neighbours[ MEM_DIRECTION_NEXT ] = next_block_p; block_header_p->allocated_bytes = allocated_bytes; - VALGRIND_NOACCESS_STRUCT( block_header_p); - JERRY_ASSERT( allocated_bytes <= mem_get_block_data_space_size( block_header_p) ); + + VALGRIND_NOACCESS_STRUCT( block_header_p); } /* mem_init_block_header */ /**