Commit 69d26c73 authored by Junliang Yan's avatar Junliang Yan Committed by Commit Bot

PPC: Fix DCHECK error in set_constant_pool_offset

the DCHECK in set_constant_pool_offset fails due to the
InstructionSize() needs builtin_index()

Change-Id: Ia86b57ebc4901672dee3012ba931e0222933ec1d
Reviewed-on: https://chromium-review.googlesource.com/c/1454265Reviewed-by: 's avatarJakob Gruber <jgruber@chromium.org>
Reviewed-by: 's avatarMichael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#59418}
parent 82d240c7
...@@ -84,6 +84,7 @@ void InitializeCode(Heap* heap, Handle<Code> code, int object_size, ...@@ -84,6 +84,7 @@ void InitializeCode(Heap* heap, Handle<Code> code, int object_size,
code->set_relocation_info(*reloc_info); code->set_relocation_info(*reloc_info);
code->initialize_flags(kind, has_unwinding_info, is_turbofanned, stack_slots, code->initialize_flags(kind, has_unwinding_info, is_turbofanned, stack_slots,
kIsNotOffHeapTrampoline); kIsNotOffHeapTrampoline);
code->set_builtin_index(builtin_index);
code->set_code_data_container(*data_container); code->set_code_data_container(*data_container);
code->set_deoptimization_data(*deopt_data); code->set_deoptimization_data(*deopt_data);
code->set_source_position_table(*source_position_table); code->set_source_position_table(*source_position_table);
...@@ -91,7 +92,6 @@ void InitializeCode(Heap* heap, Handle<Code> code, int object_size, ...@@ -91,7 +92,6 @@ void InitializeCode(Heap* heap, Handle<Code> code, int object_size,
code->set_handler_table_offset(desc.handler_table_offset); code->set_handler_table_offset(desc.handler_table_offset);
code->set_constant_pool_offset(desc.constant_pool_offset); code->set_constant_pool_offset(desc.constant_pool_offset);
code->set_code_comments_offset(desc.code_comments_offset); code->set_code_comments_offset(desc.code_comments_offset);
code->set_builtin_index(builtin_index);
// Allow self references to created code object by patching the handle to // Allow self references to created code object by patching the handle to
// point to the newly allocated Code object. // point to the newly allocated Code object.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment