Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2d762ce473a0
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b0825d87409b
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Feb 12, 2015

  1. Stop JIT first on shutdown.

    brixen committed Feb 12, 2015
    Copy the full SHA
    86fd75c View commit details
  2. Copy the full SHA
    b0825d8 View commit details
Showing with 7 additions and 3 deletions.
  1. +2 −2 vm/environment.cpp
  2. +1 −1 vm/metrics.cpp
  3. +4 −0 vm/test/test_integer.hpp
4 changes: 2 additions & 2 deletions vm/environment.cpp
Original file line number Diff line number Diff line change
@@ -551,14 +551,14 @@ namespace rubinius {
void Environment::halt(STATE) {
state->shared().tool_broker()->shutdown(state);

stop_jit(state);

stop_signals(state);

if(ImmixMarker* im = state->memory()->immix_marker()) {
im->stop(state);
}

stop_jit(state);

GCTokenImpl gct;

root_vm->set_call_frame(0);
2 changes: 1 addition & 1 deletion vm/metrics.cpp
Original file line number Diff line number Diff line change
@@ -391,7 +391,7 @@ namespace rubinius {
i != metrics_map_.end();
++i)
{
values->put(state, index, Bignum::from(state, (*i)->second));
values->put(state, index, Integer::from(state, (*i)->second));

Object* key = reinterpret_cast<Object*>(state->symbol((*i)->first.c_str()));
map->store(state, key, Fixnum::from(index++));
4 changes: 4 additions & 0 deletions vm/test/test_integer.hpp
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@ class TestInteger : public CxxTest::TestSuite, public VMTest {
destroy();
}

void test_from_zero_yields_fixnum() {
TS_ASSERT(kind_of<Fixnum>(Integer::from(state, 0)));
}

void test_kind_of_numeric() {
Fixnum* fix = Fixnum::from(13);
Bignum* big = Bignum::from(state, (native_int)14);