Update Crashpad to 32981a3ee9d7c2769fb27afa038fe2e194cfa329

third_party/crashpad/crashpad/minidump/minidump_system_info_writer.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,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "minidump/minidump_system_info_writer.h"
 
 #include <string.h>
 
 #include "base/logging.h"
 #include "minidump/minidump_string_writer.h"
 #include "snapshot/system_snapshot.h"
 #include "util/file/file_writer.h"
+#include "util/misc/arraysize_unsafe.h"
 #include "util/misc/implicit_cast.h"
 
 namespace crashpad {
 
 namespace {
 
 uint64_t AMD64FeaturesFromSystemSnapshot(
     const SystemSnapshot* system_snapshot) {
 #define ADD_FEATURE(minidump_bit) (UINT64_C(1) << (minidump_bit))
 
@@ skipping 24 matching lines @@
   MAP_FEATURE(cpuid_features, F_PAE, PF_PAE_ENABLED);
   MAP_FEATURE(cpuid_features, F_MMX, PF_MMX_INSTRUCTIONS_AVAILABLE);
   MAP_FEATURE(cpuid_features, F_SSE, PF_XMMI_INSTRUCTIONS_AVAILABLE);
   MAP_FEATURE(cpuid_features, F_SSE2, PF_XMMI64_INSTRUCTIONS_AVAILABLE);
   MAP_FEATURE(cpuid_features, F_SSE3, PF_SSE3_INSTRUCTIONS_AVAILABLE);
   MAP_FEATURE(cpuid_features, F_CX16, PF_COMPARE_EXCHANGE128);
   MAP_FEATURE(cpuid_features, F_XSAVE, PF_XSAVE_ENABLED);
   MAP_FEATURE(cpuid_features, F_RDRAND, PF_RDRAND_INSTRUCTION_AVAILABLE);
 
 #define FX_XD 20
+#define FX_RDTSCP 27
 #define FX_3DNOW 31
 
   uint64_t extended_features = system_snapshot->CPUX86ExtendedFeatures();
 
+  MAP_FEATURE(extended_features, FX_RDTSCP, PF_RDTSCP_INSTRUCTION_AVAILABLE);
   MAP_FEATURE(extended_features, FX_3DNOW, PF_3DNOW_INSTRUCTIONS_AVAILABLE);
 
 #define F7_FSGSBASE 0
 
   uint32_t leaf7_features = system_snapshot->CPUX86Leaf7Features();
 
   MAP_FEATURE(leaf7_features, F7_FSGSBASE, PF_RDWRFSGSBASE_AVAILABLE);
 
-  // This feature bit should be set if NX (XD, DEP) is enabled, not just if
-  // it’s available on the CPU as indicated by the XF_XD bit.
+  // This feature bit should be set if NX (XD, DEP) is enabled, not just if it’s
+  // available on the CPU as indicated by the FX_XD bit.
   if (system_snapshot->NXEnabled()) {
     minidump_features |= ADD_FEATURE(PF_NX_ENABLED);
   }
 
   if (system_snapshot->CPUX86SupportsDAZ()) {
     minidump_features |= ADD_FEATURE(PF_SSE_DAZ_MODE_AVAILABLE);
   }
 
-  // PF_SECOND_LEVEL_ADDRESS_TRANSLATION can’t be determined without
-  // consulting model-specific registers, a privileged operation. The exact
-  // use of PF_VIRT_FIRMWARE_ENABLED is unknown. PF_FASTFAIL_AVAILABLE is
-  // irrelevant outside of Windows.
+  // PF_SECOND_LEVEL_ADDRESS_TRANSLATION can’t be determined without consulting
+  // model-specific registers, a privileged operation. The exact use of
+  // PF_VIRT_FIRMWARE_ENABLED is unknown. PF_FASTFAIL_AVAILABLE is irrelevant
+  // outside of Windows.
 
 #undef MAP_FEATURE
 #undef ADD_FEATURE
 
   return minidump_features;
 }
 
 }  // namespace
 
 MinidumpSystemInfoWriter::MinidumpSystemInfoWriter()
@@ skipping 84 matching lines @@
 }
 
 void MinidumpSystemInfoWriter::SetCPUX86Vendor(uint32_t ebx,
                                                uint32_t edx,
                                                uint32_t ecx) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(system_info_.ProcessorArchitecture == kMinidumpCPUArchitectureX86 ||
          system_info_.ProcessorArchitecture ==
              kMinidumpCPUArchitectureX86Win64);
 
-  static_assert(arraysize(system_info_.Cpu.X86CpuInfo.VendorId) == 3,
+  static_assert(ARRAYSIZE_UNSAFE(system_info_.Cpu.X86CpuInfo.VendorId) == 3,
                 "VendorId must have 3 elements");
 
   system_info_.Cpu.X86CpuInfo.VendorId[0] = ebx;
   system_info_.Cpu.X86CpuInfo.VendorId[1] = edx;
   system_info_.Cpu.X86CpuInfo.VendorId[2] = ecx;
 }
 
 void MinidumpSystemInfoWriter::SetCPUX86VendorString(
     const std::string& vendor) {
   DCHECK_EQ(state(), kStateMutable);
@@ skipping 37 matching lines @@
   system_info_.Cpu.X86CpuInfo.AMDExtendedCpuFeatures = extended_features;
 }
 
 void MinidumpSystemInfoWriter::SetCPUOtherFeatures(uint64_t features_0,
                                                    uint64_t features_1) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(system_info_.ProcessorArchitecture != kMinidumpCPUArchitectureX86 &&
          system_info_.ProcessorArchitecture !=
              kMinidumpCPUArchitectureX86Win64);
 
-  static_assert(arraysize(system_info_.Cpu.OtherCpuInfo.ProcessorFeatures) == 2,
-                "ProcessorFeatures must have 2 elements");
+  static_assert(
+      ARRAYSIZE_UNSAFE(system_info_.Cpu.OtherCpuInfo.ProcessorFeatures) == 2,
+      "ProcessorFeatures must have 2 elements");
 
   system_info_.Cpu.OtherCpuInfo.ProcessorFeatures[0] = features_0;
   system_info_.Cpu.OtherCpuInfo.ProcessorFeatures[1] = features_1;
 }
 
 bool MinidumpSystemInfoWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
   CHECK(csd_version_);
 
   if (!MinidumpStreamWriter::Freeze()) {
@@ skipping 23 matching lines @@
   DCHECK_EQ(state(), kStateWritable);
 
   return file_writer->Write(&system_info_, sizeof(system_info_));
 }
 
 MinidumpStreamType MinidumpSystemInfoWriter::StreamType() const {
   return kMinidumpStreamTypeSystemInfo;
 }
 
 }  // namespace crashpad