From a902a9702581fd8602034aad0f14a8008cd3be97 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Thu, 9 Oct 2014 17:48:36 +0400 Subject: [PATCH] Add another 'out of memory' error message --- src/libintstructs/stack.h | 5 +++++ src/liboptimizer/pretty-printer.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/libintstructs/stack.h b/src/libintstructs/stack.h index 6a3d35950..9e0b35ecf 100644 --- a/src/libintstructs/stack.h +++ b/src/libintstructs/stack.h @@ -226,6 +226,11 @@ static TYPE *convert_##NAME##_to_raw_data (void) { \ size_t size = mem_heap_recommend_allocation_size ( \ ((size_t) (NAME.current + 1) * sizeof (NAME##_stack_value_type))); \ TYPE *DATA = (TYPE *) mem_heap_alloc_block (size, MEM_HEAP_ALLOC_LONG_TERM); \ + if (DATA == NULL) \ + { \ + __printf ("Out of memory\n"); \ + JERRY_UNREACHABLE (); \ + } \ __memset (DATA, 0, size); \ for (NAME##_stack_data_type i = 0; i < NAME.current; i++) { \ DATA[i] = STACK_ELEMENT (NAME, i); \ diff --git a/src/liboptimizer/pretty-printer.c b/src/liboptimizer/pretty-printer.c index 2d2aaa746..d6c12c094 100644 --- a/src/liboptimizer/pretty-printer.c +++ b/src/liboptimizer/pretty-printer.c @@ -244,8 +244,8 @@ pp_opcode (opcode_counter_t oc, opcode_t opcode, bool is_rewrite) PP_OP_1 (exitval, "exit %d;", status_code); PP_OP_1 (retval, "return %d;", ret_value); PP_OP_0 (ret, "ret;"); - PP_OP_3 (prop_getter, "%s = %s[\"%s\"];", lhs, obj, prop); - PP_OP_3 (prop_setter, "%s[\"%s\"] = %s;", obj, prop, rhs); + PP_OP_3 (prop_getter, "%s = %s.%s;", lhs, obj, prop); + PP_OP_3 (prop_setter, "%s.%s = %s;", obj, prop, rhs); PP_OP_1 (this, "%s = this;", lhs); PP_OP_2 (delete_var, "%s = delete %s;", lhs, name); PP_OP_3 (delete_prop, "%s = delete %s[\"%s\"];", lhs, base, name); @@ -537,7 +537,7 @@ pp_opcode (opcode_counter_t oc, opcode_t opcode, bool is_rewrite) JERRY_UNREACHABLE (); } } - for (opcode_counter_t counter = start; counter <= oc; counter++) + for (opcode_counter_t counter = start; counter < oc; counter++) { opcode_t meta_op = deserialize_opcode (counter); switch (meta_op.op_idx)