Browse Source

Merge pull request #1433 from svaarala/fix-retconstn-assert-no-refc

Fix RETCONSTN assert when refcounting disabled
pull/1436/head
Sami Vaarala 8 years ago
committed by GitHub
parent
commit
741f92c15c
  1. 3
      RELEASES.rst
  2. 2
      src-input/duk_js_executor.c

3
RELEASES.rst

@ -2670,6 +2670,9 @@ Planned
* Fix alignment increase warning with clang (GH-1430, GH-1431)
* Fix incorrect assert for RETCONSTN opcode when refcounting is disabled,
actual behavior is correct however (GH-1432, GH-1433)
* Avoid log2(), log10(), cbrt(), and trunc() on Android and Atari MiNT
(GH-1325, GH-1341, GH-1430, GH-1431)

2
src-input/duk_js_executor.c

@ -3940,7 +3940,9 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
DUK__SYNC_AND_NULL_CURR_PC();
tv = DUK__CONSTP_BC(ins);
DUK_TVAL_SET_TVAL(thr->valstack_top, tv);
#if defined(DUK_USE_REFERENCE_COUNTING)
DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv)); /* no INCREF for this constant */
#endif
thr->valstack_top++;
DUK__RETURN_SHARED();
}

Loading…
Cancel
Save