diff --git a/vm/code_block.cpp b/vm/code_block.cpp index 9eec4a2ea6..c2dfe1cac3 100755 --- a/vm/code_block.cpp +++ b/vm/code_block.cpp @@ -345,8 +345,8 @@ void copy_literal_references(code_block *compiled, factorvm *myvm) void factorvm::relocate_code_block_step(relocation_entry rel, cell index, code_block *compiled) { #ifdef FACTOR_DEBUG - tagged(compiled->literals).untag_check(vm); - tagged(compiled->relocation).untag_check(vm); + tagged(compiled->literals).untag_check(this); + tagged(compiled->relocation).untag_check(this); #endif store_address_in_code_block(relocation_class_of(rel), diff --git a/vm/inlineimpls.hpp b/vm/inlineimpls.hpp index 6b74634715..a247afa4d7 100644 --- a/vm/inlineimpls.hpp +++ b/vm/inlineimpls.hpp @@ -176,7 +176,6 @@ struct gc_root : public tagged void push() { myvm->check_tagged_pointer(tagged::value()); myvm->gc_locals.push_back((cell)this); } - //explicit gc_root(cell value_, factorvm *vm) : myvm(vm),tagged(value_) { push(); } explicit gc_root(cell value_,factorvm *vm) : tagged(value_),myvm(vm) { push(); } explicit gc_root(TYPE *value_, factorvm *vm) : tagged(value_),myvm(vm) { push(); } @@ -344,7 +343,7 @@ inline double factorvm::fixnum_to_float(cell tagged) keep the callstack in a GC root and use relative offsets */ template void factorvm::iterate_callstack_object(callstack *stack_, TYPE &iterator) { - gc_root stack(stack_,vm); + gc_root stack(stack_,this); fixnum frame_offset = untag_fixnum(stack->length) - sizeof(stack_frame); while(frame_offset >= 0)