Revision: 13359 Author: [email protected] Date: Fri Jan 11 00:07:08 2013 Log: Merged r13237 into 3.15 branch.
Fixed resizing of deopt table BUG=chrome:166554 [email protected] Review URL: https://codereview.chromium.org/11864005 http://code.google.com/p/v8/source/detail?r=13359 Modified: /branches/3.15/src/deoptimizer.cc /branches/3.15/src/version.cc ======================================= --- /branches/3.15/src/deoptimizer.cc Mon Dec 10 11:00:50 2012 +++ /branches/3.15/src/deoptimizer.cc Fri Jan 11 00:07:08 2013 @@ -1411,8 +1411,9 @@ ? 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); ======================================= --- /branches/3.15/src/version.cc Thu Jan 10 23:27:44 2013 +++ /branches/3.15/src/version.cc Fri Jan 11 00:07:08 2013 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 15 #define BUILD_NUMBER 11 -#define PATCH_LEVEL 6 +#define PATCH_LEVEL 7 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
