commit b6a74d8fea21ec53081bfea478d81f42f6184846
author Nicolas Geoffray <ngeoffray@google.com> Thu Apr 14 14:17:29 2016 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri Apr 15 14:59:09 2016 +0100
tree 0da72bcf1979f21b45c22516d8060bfe2a92f082
parent bb11c8b1219f5b4b3154c2c83fca19ec8add6646

Fix initialization of field after conflicting merges.

bug:27865109

(cherry picked from commit ba6aae0b49932a0ae3050d1fc22c6571e51f8180)

Change-Id: Ia2a0cac929070a02bfbf3ed3eb0a30fc33aba46d

runtime/jit/jit.cc

diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index a9ac1fb..8f126bf 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -158,6 +158,7 @@
   jit->hot_method_threshold_ = options->GetCompileThreshold();
   jit->warm_method_threshold_ = options->GetWarmupThreshold();
   jit->osr_method_threshold_ = options->GetOsrThreshold();
+  jit->priority_thread_weight_ = options->GetPriorityThreadWeight();
 
   jit->CreateThreadPool();