Merge pull request #850 from svaarala/fix-ptrcomp-stringtable

Fix compilation error when using pointer compression and probe-based string table

RELEASES.rst

@@ -1703,6 +1703,10 @@ Planned
   allocator which supports runtime resizing of pool counts to specified
   memory target and realloc shrinking (GH-847)
 
+* Fix compilation error triggered when using pointer compression and the
+  default string table implementation (probe-based rather than chained)
+  (GH-850)
+
 * Fix a harmless compilation warning related to a shadowed variable (GH-793,
   GH-794)
 

src/duk_debugger.c

@@ -1786,7 +1786,7 @@ DUK_LOCAL void duk__debug_dump_strtab_probe(duk_hthread *thr, duk_heap *heap) {
 
 	for (i = 0; i < heap->st_size; i++) {
 #if defined(DUK_USE_HEAPPTR16)
-		h = DUK_USE_HEAPPTR_DEC16(heap->strtable16[i]);
+		h = DUK_USE_HEAPPTR_DEC16(heap->heap_udata, heap->strtable16[i]);
 #else
 		h = heap->strtable[i];
 #endif

src/duk_heap_markandsweep.c

@@ -648,7 +648,7 @@ DUK_LOCAL void duk__sweep_stringtable_probe(duk_heap *heap, duk_size_t *out_coun
 
 	for (i = 0; i < heap->st_size; i++) {
 #if defined(DUK_USE_HEAPPTR16)
-		h = (duk_hstring *) DUK_USE_HEAPPTR_DEC16(heap->strtable16[i]);
+		h = (duk_hstring *) DUK_USE_HEAPPTR_DEC16(heap->heap_udata, heap->strtable16[i]);
 #else
 		h = heap->strtable[i];
 #endif