From 907dd9b8f523b35156ee60944c4611685db0f6a9 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 12 Jul 2022 18:26:22 +0000
Subject: [PATCH] [vm, compiler] Don't use an architecture-specific name for
 FPU registers in the register allocator.

TEST=ci
Change-Id: Id2cc6cf9f3275180692f13226d4198126e12b398
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/251149
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 runtime/vm/compiler/backend/linearscan.cc | 6 +++---
 runtime/vm/compiler/backend/linearscan.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/vm/compiler/backend/linearscan.cc b/runtime/vm/compiler/backend/linearscan.cc
index 0dafbb87a41..68e5b3ed090 100644
--- a/runtime/vm/compiler/backend/linearscan.cc
+++ b/runtime/vm/compiler/backend/linearscan.cc
@@ -103,7 +103,7 @@ FlowGraphAllocator::FlowGraphAllocator(const FlowGraph& flow_graph,
       vreg_count_(flow_graph.max_virtual_register_number()),
       live_ranges_(flow_graph.max_virtual_register_number()),
       unallocated_cpu_(),
-      unallocated_xmm_(),
+      unallocated_fpu_(),
       cpu_regs_(),
       fpu_regs_(),
       blocked_cpu_registers_(),
@@ -2767,7 +2767,7 @@ void FlowGraphAllocator::CompleteRange(LiveRange* range, Location::Kind kind) {
       break;
 
     case Location::kFpuRegister:
-      AddToSortedListOfRanges(&unallocated_xmm_, range);
+      AddToSortedListOfRanges(&unallocated_fpu_, range);
       break;
 
     default:
@@ -3351,7 +3351,7 @@ void FlowGraphAllocator::AllocateRegisters() {
   untagged_spill_slots_.Clear();
 
   PrepareForAllocation(Location::kFpuRegister, kNumberOfFpuRegisters,
-                       unallocated_xmm_, fpu_regs_, blocked_fpu_registers_);
+                       unallocated_fpu_, fpu_regs_, blocked_fpu_registers_);
   AllocateUnallocatedRanges();
 
   GraphEntryInstr* entry = block_order_[0]->AsGraphEntry();
diff --git a/runtime/vm/compiler/backend/linearscan.h b/runtime/vm/compiler/backend/linearscan.h
index 8256a1a4004..ea3fb9cdb60 100644
--- a/runtime/vm/compiler/backend/linearscan.h
+++ b/runtime/vm/compiler/backend/linearscan.h
@@ -317,7 +317,7 @@ class FlowGraphAllocator : public ValueObject {
   GrowableArray<LiveRange*> live_ranges_;
 
   GrowableArray<LiveRange*> unallocated_cpu_;
-  GrowableArray<LiveRange*> unallocated_xmm_;
+  GrowableArray<LiveRange*> unallocated_fpu_;
 
   LiveRange* cpu_regs_[kNumberOfCpuRegisters];
   LiveRange* fpu_regs_[kNumberOfFpuRegisters];