errors.cpp: Patch looked like it would work. It either exposes more gc bugs or is...

Revert "errors.cpp: general_error() throws away its args when it calls compact_gc() when compiled with DEBUG=1. Save the args as data_roots instead. Fixes #615. See #620."

This reverts commit dc462970506ea721166dfd4ccd53a458cccd0505.

diff --git a/vm/errors.cpp b/vm/errors.cpp
index bf19f879ef8ea2207298bf0def67ce70b1289134..ced151815669e11b519797856179f9348df7e853 100755 (executable)
--- a/vm/errors.cpp
+++ b/vm/errors.cpp
@@ -41,7 +41,7 @@ void out_of_memory()
        abort();
 }
 
-void factor_vm::general_error(vm_error_type error, cell arg1_, cell arg2_)
+void factor_vm::general_error(vm_error_type error, cell arg1, cell arg2)
 {
        faulting_p = true;
 
@@ -50,9 +50,6 @@ void factor_vm::general_error(vm_error_type error, cell arg1_, cell arg2_)
        bignum_roots.clear();
        code_roots.clear();
 
-       data_root<object> arg1(arg1_,this);
-       data_root<object> arg2(arg2_,this);
-
        /* If we had an underflow or overflow, data or retain stack
        pointers might be out of bounds, so fix them before allocating
        anything */
@@ -72,7 +69,7 @@ void factor_vm::general_error(vm_error_type error, cell arg1_, cell arg2_)
 
                /* Now its safe to allocate and GC */
                cell error_object = allot_array_4(special_objects[OBJ_ERROR],
-                       tag_fixnum(error),arg1.value(),arg2.value());
+                       tag_fixnum(error),arg1,arg2);
 
                ctx->push(error_object);
 
@@ -87,8 +84,8 @@ void factor_vm::general_error(vm_error_type error, cell arg1_, cell arg2_)
        {
                std::cout << "You have triggered a bug in Factor. Please report.\n";
                std::cout << "error: " << error << std::endl;
-               std::cout << "arg 1: "; print_obj(arg1.value()); std::cout << std::endl;
-               std::cout << "arg 2: "; print_obj(arg2.value()); std::cout << std::endl;
+               std::cout << "arg 1: "; print_obj(arg1); std::cout << std::endl;
+               std::cout << "arg 2: "; print_obj(arg2); std::cout << std::endl;
                factorbug();
                abort();
        }