Revert previous patch; not simply a typo. Still broken on win64.

diff --git a/vm/gc.cpp b/vm/gc.cpp
index 22c851378c7a84f72e116517af03f66d7a7ef2c1..0de3dac91f6d480c3d1d56eae3186b6e5afcccfd 100755 (executable)
--- a/vm/gc.cpp
+++ b/vm/gc.cpp
@@ -230,7 +230,7 @@ struct call_frame_scrubber {
                gc_info *info = compiled->block_gc_info();
 
                assert(return_address < compiled->size());
-               cell index = info->return_address_index(return_address);
+               int index = info->return_address_index(return_address);
                if(index != -1)
                        ctx->scrub_stacks(info,index);
        }

diff --git a/vm/slot_visitor.hpp b/vm/slot_visitor.hpp
index b97f988e6590e7079c4171796b151e445f3b7ea3..303fc37544512e9f3fa242399d3678fb2d27fad3 100755 (executable)
--- a/vm/slot_visitor.hpp
+++ b/vm/slot_visitor.hpp
@@ -292,7 +292,7 @@ struct call_frame_slot_visitor {
                gc_info *info = compiled->block_gc_info();
 
                assert(return_address < compiled->size());
-               cell callsite = info->return_address_index(return_address);
+               u32 callsite = info->return_address_index(return_address);
                if(callsite == gc_info_missing_value)
                        return;