rubinius · May 8, 2016 · May 8, 2016 · May 9, 2016
Showing with 3 additions and 50 deletions.

+1 −11 machine/builtin/block_environment.cpp

+0 −6 machine/instructions.def

+1 −23 machine/machine_code.cpp

+0 −5 machine/machine_code.hpp

+1 −5 scripts/deploy.sh
diff --git a/machine/builtin/block_environment.cpp b/machine/builtin/block_environment.cpp
@@ -383,17 +383,7 @@ namespace rubinius {
       return 0;
     }
 
-    if(mcode->call_count >= 0) {
-      // TODO: JIT
-      if(false /*mcode->call_count >= state->shared().config.jit_threshold_compile*/) {
-        OnStack<1> os(state, env);
-
-        G(jit)->compile_soon(state, env->compiled_code(),
-            invocation.self->direct_class(state), env, true);
-      } else {
-        mcode->call_count++;
-      }
-    }
+    mcode->call_count++;
 
     StackVariables* scope = ALLOCA_STACKVARIABLES(mcode->number_of_locals);
 

diff --git a/machine/instructions.def b/machine/instructions.def
@@ -1760,12 +1760,6 @@ section "Miscellaneous. TODO: better categorize these"
 instruction check_interrupts() [ -- ]
   flush_ip();
 
-  // This is used in loops, and allows loops to heat a method up.
-  if(mcode->call_count >= 0) {
-    mcode->loop_count++;
-    mcode->call_count++;
-  }
-
   state->vm()->checkpoint(state);
 end
 

diff --git a/machine/machine_code.cpp b/machine/machine_code.cpp
@@ -59,7 +59,6 @@ namespace rubinius {
     , stack_size(code->stack_size()->to_native())
     , number_of_locals(code->number_of_locals())
     , call_count(0)
-    , loop_count(0)
     , uncommon_count(0)
     , _call_site_count_(0)
     , _constant_cache_count_(0)
@@ -85,14 +84,6 @@ namespace rubinius {
       splat_position = pos->to_native();
     }
 
-    /* TODO: JIT
-    // Disable JIT for large methods
-    if(state->shared().config.jit_disabled ||
-        total > (size_t)state->shared().config.jit_limit_method_size) {
-      call_count = -1;
-    }
-    */
-
     for(int i = 0; i < cMaxSpecializations; i++) {
       specializations[i].class_data.raw = 0;
       specializations[i].execute = 0;
@@ -762,20 +753,7 @@ namespace rubinius {
         return NULL;
       }
 
-      // A negative call_count means we've disabled usage based JIT
-      // for this method.
-      if(mcode->call_count >= 0) {
-        /* TODO: JIT
-        if(mcode->call_count >= state->shared().config.jit_threshold_compile) {
-          OnStack<3> os(state, exec, mod, code);
-
-          G(jit)->compile_callframe(state, code);
-        } else {
-          mcode->call_count++;
-        }
-        */
-        mcode->call_count++;
-      }
+      mcode->call_count++;
 
       Object* value = 0;
 

diff --git a/machine/machine_code.hpp b/machine/machine_code.hpp
@@ -70,7 +70,6 @@ namespace rubinius {
     native_int number_of_locals;
 
     native_int call_count;
-    native_int loop_count;
     native_int uncommon_count;
 
     attr_field(call_site_count, size_t);
@@ -140,10 +139,6 @@ namespace rubinius {
       flags |= eNoInline;
     }
 
-    native_int method_call_count() const {
-      return call_count - loop_count;
-    }
-
     CallSite* call_site(STATE, int ip);
     ConstantCache* constant_cache(STATE, int ip);
 

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -352,7 +352,7 @@ EOF
 
 function rbx_deploy_usage {
   cat >&2 <<-EOM
-Usage: ${0##*/} [release github travis heroku homebrew website docker trigger-heroku trigger-homebrew trigger-travis-osx trigger-travis-12.04 trigger-travis-14.04 triggers]
+Usage: ${0##*/} [release github travis heroku homebrew website docker trigger-heroku trigger-homebrew trigger-travis-osx trigger-travis-14.04 triggers]
 EOM
   exit 1
 }
@@ -394,17 +394,13 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
       "trigger-travis-osx")
         rbx_trigger_deploy "$TRAVIS_OS_NAME" travis-osx
         ;;
-      "trigger-travis-12.04")
-        rbx_trigger_deploy "$TRAVIS_OS_NAME" travis-12.04
-        ;;
       "trigger-travis-14.04")
         rbx_trigger_deploy "$TRAVIS_OS_NAME" travis-14.04
         ;;
       "triggers")
         rbx_trigger_deploy "$TRAVIS_OS_NAME" heroku
         rbx_trigger_deploy "$TRAVIS_OS_NAME" homebrew
         rbx_trigger_deploy "$TRAVIS_OS_NAME" travis-osx
-        rbx_trigger_deploy "$TRAVIS_OS_NAME" travis-12.04
         rbx_trigger_deploy "$TRAVIS_OS_NAME" travis-14.04
         ;;
       "-h"|"--help"|*)