Fix collision between 49c03db12965 and 56503fef865d

snapshot/cpu_context_mac.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 209 matching lines @@
   context->r15 = x86_thread_state64->__r15;
   context->rip = x86_thread_state64->__rip;
   context->rflags = x86_thread_state64->__rflags;
   context->cs = x86_thread_state64->__cs;
   context->fs = x86_thread_state64->__fs;
   context->gs = x86_thread_state64->__gs;
 }
 
 void InitializeCPUContextX86_64Float(
     CPUContextX86_64* context, const x86_float_state64_t* x86_float_state64) {
-  // This relies on both x86_float_state64_t and context->fxsave64 having
-  // identical (fxsave64) layout.
+  // This relies on both x86_float_state64_t and context->fxsave having
+  // identical (fxsave) layout.
   static_assert(offsetof(x86_float_state64_t, __fpu_reserved1) -
                          offsetof(x86_float_state64_t, __fpu_fcw) ==
-                     sizeof(context->fxsave64),
+                     sizeof(context->fxsave),
                 "types must be equivalent");
 
-  memcpy(&context->fxsave64,
+  memcpy(&context->fxsave,
          &x86_float_state64->__fpu_fcw,
-         sizeof(context->fxsave64));
+         sizeof(context->fxsave));
 }
 
 void InitializeCPUContextX86_64Debug(
     CPUContextX86_64* context, const x86_debug_state64_t* x86_debug_state64) {
   context->dr0 = x86_debug_state64->__dr0;
   context->dr1 = x86_debug_state64->__dr1;
   context->dr2 = x86_debug_state64->__dr2;
   context->dr3 = x86_debug_state64->__dr3;
   context->dr4 = x86_debug_state64->__dr4;
   context->dr5 = x86_debug_state64->__dr5;
@@ skipping 181 matching lines @@
   if (set_flavor != x86_DEBUG_STATE64) {
     InitializeCPUContextX86_64Debug(context, x86_debug_state64);
   }
 }
 
 }  // namespace internal
 
 #endif
 
 }  // namespace crashpad