Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8300227: [macos_aarch64] assert(cpu_has("hw.optional.arm.FEAT_AES")) …
…failed after JDK-8297092

Reviewed-by: dholmes
  • Loading branch information
Hao Sun committed Jan 17, 2023
1 parent 6a81d52 commit f829a67
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp
Expand Up @@ -72,10 +72,10 @@ void VM_Version::get_os_cpu_info() {

// All Apple-darwin Arm processors have AES, PMULL, SHA1 and SHA2.
// See https://github.com/apple-oss-distributions/xnu/blob/main/osfmk/arm/commpage/commpage.c#L412
assert(cpu_has("hw.optional.arm.FEAT_AES"), "should be");
assert(cpu_has("hw.optional.arm.FEAT_PMULL"), "should be");
assert(cpu_has("hw.optional.arm.FEAT_SHA1"), "should be");
assert(cpu_has("hw.optional.arm.FEAT_SHA256"), "should be");
// Note that we ought to add assertions to check sysctlbyname parameters for
// these four CPU features, e.g., "hw.optional.arm.FEAT_AES", but the
// corresponding string names are not available before xnu-8019 version.
// Hence, assertions are omitted considering backward compatibility.
_features |= CPU_AES | CPU_PMULL | CPU_SHA1 | CPU_SHA2;

if (cpu_has("hw.optional.armv8_crc32")) {
Expand Down

1 comment on commit f829a67

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.