Cleanups

diff --git a/vm/factor.cpp b/vm/factor.cpp
index 28f0afacf60c22a60cf98e70790102d07ae10c49..b607adba6303d24c83b81a5c39c41f459a4a5845 100755 (executable)
--- a/vm/factor.cpp
+++ b/vm/factor.cpp
@@ -125,10 +125,7 @@ VM_C_API void init_factor(vm_parameters *p)
        load_image(p);
        init_c_io();
        init_inline_caching(p->max_pic_size);
-
-#ifndef FACTOR_DEBUG
        init_signals();
-#endif
 
        if(p->console)
                open_console();

diff --git a/vm/local_roots.hpp b/vm/local_roots.hpp
index 9506a421f5634eb69364e94e542950951f0260de..e074d999e7f221b17066a2ed8d8661d52b7919d4 100644 (file)
--- a/vm/local_roots.hpp
+++ b/vm/local_roots.hpp
@@ -20,7 +20,14 @@ struct gc_root : public tagged<T>
        const gc_root<T>& operator=(const T *x) { tagged<T>::operator=(x); return *this; }
        const gc_root<T>& operator=(const cell &x) { tagged<T>::operator=(x); return *this; }
 
-       ~gc_root() { cell old = gc_local_pop(); assert(old == (cell)this); }
+       ~gc_root() {
+#ifdef FACTOR_DEBUG
+               cell old = gc_local_pop();
+               assert(old == (cell)this);
+#else
+               gc_local_pop();
+#endif
+       }
 };
 
 /* A similar hack for the bignum implementation */

diff --git a/vm/quotations.cpp b/vm/quotations.cpp
index 2b9a37a6f7c401f7a0e6144169c038b5c08dd824..c87cf8dc8275fb2d3715e6d242809b5ec9ebacbd 100755 (executable)
--- a/vm/quotations.cpp
+++ b/vm/quotations.cpp
@@ -323,11 +323,11 @@ fixnum quot_code_offset_to_scan(cell quot_, cell offset)
        gc_root<quotation> quot(quot_);
        gc_root<array> array(quot->array);
 
-       quotation_jit jit(quot.value(),false,false);
-       jit.compute_position(offset);
-       jit.iterate_quotation();
+       quotation_jit compiler(quot.value(),false,false);
+       compiler.compute_position(offset);
+       compiler.iterate_quotation();
 
-       return jit.get_position();
+       return compiler.get_position();
 }
 
 VM_ASM_API cell lazy_jit_compile_impl(cell quot_, stack_frame *stack)