* Merged with 0da121c758b9.

diff --cc src/mm/dumpmemory.c
Simple merge

diff --cc src/mm/dumpmemory.h
Simple merge

diff --cc src/mm/memory.h
Simple merge

diff --cc src/vm/jit/ir/bytecode.c
Simple merge

diff --cc src/vm/jit/ir/bytecode.h
Simple merge