From a4584c07e77bc0f5bf7fc2ee73a2194954fa64d4 Mon Sep 17 00:00:00 2001 From: rmcilroy Date: Thu, 9 Jul 2015 02:14:32 -0700 Subject: [PATCH] [turbofan] Use NumAllocatableRegisters() instead of kMaxNumAllocatableRegisters. Use NumAllocatableRegisters() instead of kMaxNumAllocatableRegisters in ArchDefaultRegisterConfiguration::ArchDefaultRegisterConfiguration() otherwise the compiler DCHECKS if triggered during snapshot builds on Arm where only 16 DoubleRegisters are avaiable instead of 32. BUG=v8:4280 LOG=N Review URL: https://codereview.chromium.org/1230473006 Cr-Commit-Position: refs/heads/master@{#29548} --- src/compiler/register-configuration.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/register-configuration.cc b/src/compiler/register-configuration.cc index a3d3be1790..ebe6cfe23c 100644 --- a/src/compiler/register-configuration.cc +++ b/src/compiler/register-configuration.cc @@ -25,7 +25,7 @@ class ArchDefaultRegisterConfiguration : public RegisterConfiguration { 1, 1, #else - DoubleRegister::kMaxNumAllocatableRegisters, + DoubleRegister::NumAllocatableRegisters(), DoubleRegister::NumAllocatableAliasedRegisters(), #endif general_register_name_table_, @@ -35,7 +35,9 @@ class ArchDefaultRegisterConfiguration : public RegisterConfiguration { for (int i = 0; i < Register::kMaxNumAllocatableRegisters; ++i) { general_register_name_table_[i] = Register::AllocationIndexToString(i); } - for (int i = 0; i < DoubleRegister::kMaxNumAllocatableRegisters; ++i) { + DCHECK_GE(DoubleRegister::kMaxNumAllocatableRegisters, + DoubleRegister::NumAllocatableRegisters()); + for (int i = 0; i < DoubleRegister::NumAllocatableRegisters(); ++i) { double_register_name_table_[i] = DoubleRegister::AllocationIndexToString(i); }