hg: panama/dev: Fix code conflict in AArch64 backend with jdk master which is introduced by code rebase

[yang.zhang at arm.com]

Changeset: fa925f843181
Author:    yzhang
Date:      2020-05-19 14:22 +0800
URL:       https://hg.openjdk.java.net/panama/dev/rev/fa925f843181

Fix code conflict in AArch64 backend with jdk master which is introduced by code rebase

! src/hotspot/cpu/aarch64/aarch64.ad