Fix collision between 49c03db12965 and 56503fef865d

snapshot/cpu_context_mac_test.cc

Index: snapshot/cpu_context_mac_test.cc
diff --git a/snapshot/cpu_context_mac_test.cc b/snapshot/cpu_context_mac_test.cc
index 0968da86ff8f094b994a8a128a9d821f3b2aa023..16aab4a6fc9fec7aadf4c388ce97df7872c54746 100644
--- a/snapshot/cpu_context_mac_test.cc
+++ b/snapshot/cpu_context_mac_test.cc
@@ -239,7 +239,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
                                          &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);
   }
 
@@ -265,7 +265,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &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);
   }
 
@@ -283,7 +283,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &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);
   }
 
@@ -301,7 +301,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &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);
   }
 
@@ -328,7 +328,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &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);
   }
 
@@ -348,7 +348,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &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);
   }
 
@@ -368,7 +368,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &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);
   }
 
@@ -390,7 +390,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &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);
   }
 
@@ -409,7 +409,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &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);
   }
 }