commit 24950e1e9a94cbae5f0c9adbb5260c2afa4b20b0
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 10 09:11:00 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 10 09:11:00 2016 +0000
tree 8ca27d9c90f128b59eff53a1fb531e1ec2bb60ab
parent d6f5b7659ef823336f50cd7aa4b9cbab681cf67f
parent 7c9f3ba7b4f7b9543dbd539ffdc7be818284d922

Merge "Fix braino when parsing invoke transition weight."

runtime/jit/jit.cc

diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index e9317a5..dcc6300 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -103,13 +103,13 @@
   }
 
   if (options.Exists(RuntimeArgumentMap::JITInvokeTransitionWeight)) {
+    jit_options->invoke_transition_weight_ =
+        *options.Get(RuntimeArgumentMap::JITInvokeTransitionWeight);
     if (jit_options->invoke_transition_weight_ > jit_options->warmup_threshold_) {
       LOG(FATAL) << "Invoke transition weight is above the warmup threshold.";
     } else if (jit_options->invoke_transition_weight_  == 0) {
-      LOG(FATAL) << "Invoke transition ratio cannot be 0.";
+      LOG(FATAL) << "Invoke transition weight cannot be 0.";
     }
-    jit_options->invoke_transition_weight_ =
-        *options.Get(RuntimeArgumentMap::JITInvokeTransitionWeight);
   } else {
     jit_options->invoke_transition_weight_ = std::max(
         jit_options->warmup_threshold_ / Jit::kDefaultInvokeTransitionWeightRatio,