From ba6aae0b49932a0ae3050d1fc22c6571e51f8180 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 14 Apr 2016 14:17:29 +0100 Subject: [PATCH] Fix initialization of field after conflicting merges. Change-Id: I5c887d5cbcd94f51c3566e964d217a906dbaa9ea --- runtime/jit/jit.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc index 4ba90c12c..558e4435f 100644 --- a/runtime/jit/jit.cc +++ b/runtime/jit/jit.cc @@ -153,6 +153,7 @@ Jit* Jit::Create(JitOptions* options, std::string* error_msg) { 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(); -- 2.11.0