Fix collision between 49c03db12965 and 56503fef865d

snapshot/cpu_context_mac_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 221 matching lines @@
   {
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(&cpu_context_x86_64,
                                          THREAD_STATE_NONE,
                                          NULL,
                                          0,
                                          &x86_thread_state64,
                                          &x86_float_state64,
                                          &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
   // Supply context in a CPU-specific “flavor” parameter expected to be used
   // instead of the supplied thread, float, or debug state parameters. Do this
   // once for each of the three valid flavors. This simulates how
   // InitializeCPUContextX86_64() might be used to initialize the context in an
   // exception handler, where the exception handler may have received the
   // “flavor” parameter and this context should be used to initialize the
   // CPUContextX86_64.
 
   {
     x86_thread_state64_t alt_x86_thread_state64 = {};
     alt_x86_thread_state64.__rax = 13;
 
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(
         &cpu_context_x86_64,
         x86_THREAD_STATE64,
         reinterpret_cast<natural_t*>(&alt_x86_thread_state64),
         x86_THREAD_STATE64_COUNT,
         &x86_thread_state64,
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(13u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
   {
     x86_float_state64_t alt_x86_float_state64 = {};
     alt_x86_float_state64.__fpu_ftw = 14;
 
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(
         &cpu_context_x86_64,
         x86_FLOAT_STATE64,
         reinterpret_cast<natural_t*>(&alt_x86_float_state64),
         x86_FLOAT_STATE64_COUNT,
         &x86_thread_state64,
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(14u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(14u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
   {
     x86_debug_state64_t alt_x86_debug_state64 = {};
     alt_x86_debug_state64.__dr0 = 15;
 
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(
         &cpu_context_x86_64,
         x86_DEBUG_STATE64,
         reinterpret_cast<natural_t*>(&alt_x86_debug_state64),
         x86_DEBUG_STATE64_COUNT,
         &x86_thread_state64,
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(15u, cpu_context_x86_64.dr0);
   }
 
   // Supply context in a universal “flavor” parameter expected to be used
   // instead of the supplied thread, float, or debug state parameters. The
   // universal format allows an exception handler to be registered to receive
   // thread, float, or debug state without having to know in advance whether it
   // will be receiving the state from a 32-bit or 64-bit process. For
   // CPUContextX86_64, only the 64-bit form is supported.
 
   {
     x86_thread_state x86_thread_state_3264 = {};
     x86_thread_state_3264.tsh.flavor = x86_THREAD_STATE64;
     x86_thread_state_3264.tsh.count = x86_THREAD_STATE64_COUNT;
     x86_thread_state_3264.uts.ts64.__rax = 16;
 
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(
         &cpu_context_x86_64,
         x86_THREAD_STATE,
         reinterpret_cast<natural_t*>(&x86_thread_state_3264),
         x86_THREAD_STATE_COUNT,
         &x86_thread_state64,
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(16u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
   {
     x86_float_state x86_float_state_3264 = {};
     x86_float_state_3264.fsh.flavor = x86_FLOAT_STATE64;
     x86_float_state_3264.fsh.count = x86_FLOAT_STATE64_COUNT;
     x86_float_state_3264.ufs.fs64.__fpu_ftw = 17;
 
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(
         &cpu_context_x86_64,
         x86_FLOAT_STATE,
         reinterpret_cast<natural_t*>(&x86_float_state_3264),
         x86_FLOAT_STATE_COUNT,
         &x86_thread_state64,
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(17u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(17u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
   {
     x86_debug_state x86_debug_state_3264 = {};
     x86_debug_state_3264.dsh.flavor = x86_DEBUG_STATE64;
     x86_debug_state_3264.dsh.count = x86_DEBUG_STATE64_COUNT;
     x86_debug_state_3264.uds.ds64.__dr0 = 18;
 
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(
         &cpu_context_x86_64,
         x86_DEBUG_STATE,
         reinterpret_cast<natural_t*>(&x86_debug_state_3264),
         x86_DEBUG_STATE_COUNT,
         &x86_thread_state64,
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(18u, cpu_context_x86_64.dr0);
   }
 
   // Supply inappropriate “flavor” contexts to test that
   // InitializeCPUContextX86() detects the problem and refuses to use the
   // supplied “flavor” context, falling back to the thread, float, and debug
   // states.
 
   {
     x86_thread_state32_t x86_thread_state32 = {};
 
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(
         &cpu_context_x86_64,
         x86_THREAD_STATE32,
         reinterpret_cast<natural_t*>(&x86_thread_state32),
         x86_THREAD_STATE32_COUNT,
         &x86_thread_state64,
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
   {
     x86_thread_state x86_thread_state_3264 = {};
     x86_thread_state_3264.tsh.flavor = x86_THREAD_STATE32;
     x86_thread_state_3264.tsh.count = x86_THREAD_STATE32_COUNT;
 
     CPUContextX86_64 cpu_context_x86_64 = {};
     internal::InitializeCPUContextX86_64(
         &cpu_context_x86_64,
         x86_THREAD_STATE,
         reinterpret_cast<natural_t*>(&x86_thread_state_3264),
         x86_THREAD_STATE_COUNT,
         &x86_thread_state64,
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 }
 
 #endif
 
 }  // namespace