Merged r13237 into 3.15 branch.

src/deoptimizer.cc

Index: src/deoptimizer.cc
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index 8f1711144e65c9a121a233b08a44d507ea893332..48b1d3f59415a19bd09acc05e020b69ffe4c8b18 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -1411,8 +1411,9 @@ void Deoptimizer::EnsureCodeForDeoptimizationEntry(BailoutType type,
       ? data->eager_deoptimization_entry_code_entries_
       : data->lazy_deoptimization_entry_code_entries_;
   if (max_entry_id < entry_count) return;
-  entry_count = Min(Max(entry_count * 2, Deoptimizer::kMinNumberOfEntries),
-                    Deoptimizer::kMaxNumberOfEntries);
+  entry_count = Max(entry_count, Deoptimizer::kMinNumberOfEntries);
+  while (max_entry_id >= entry_count) entry_count *= 2;
+  ASSERT(entry_count <= Deoptimizer::kMaxNumberOfEntries);
 
   MacroAssembler masm(Isolate::Current(), NULL, 16 * KB);
   masm.set_emit_debug_code(false);