Skip to content

Commit 7ef3891

Browse files
committed
svm/VerifyAArch64RegisterUsages: allow usage in DwarfRegEncodingAArch64
1 parent 7d56f4a commit 7ef3891

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyAArch64RegisterUsages.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
*/
2525
package jdk.graal.compiler.core.test;
2626

27+
import java.util.Arrays;
28+
import java.util.List;
29+
2730
import jdk.graal.compiler.nodes.StructuredGraph;
2831
import jdk.graal.compiler.nodes.java.LoadFieldNode;
2932
import jdk.graal.compiler.nodes.spi.CoreProviders;
@@ -35,9 +38,6 @@
3538
import jdk.vm.ci.meta.ResolvedJavaMethod;
3639
import jdk.vm.ci.meta.ResolvedJavaType;
3740

38-
import java.util.Arrays;
39-
import java.util.List;
40-
4141
/**
4242
* Verify that scratch registers are not used in AArch64 specific code. We use a different set for
4343
* HotSpot (r8/r9) and SubstrateVM (r9/r10).
@@ -63,6 +63,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
6363
case "jdk.graal.compiler.hotspot.aarch64.AArch64HotSpotBackend.emitCodePrefix":
6464
case "com.oracle.svm.core.aarch64.SubstrateAArch64MacroAssembler.<clinit>":
6565
case "com.oracle.svm.core.graal.aarch64.SubstrateAArch64RegisterConfig.getCallingConvention":
66+
case "com.oracle.objectfile.elf.dwarf.DwarfLocSectionImpl$DwarfRegEncodingAArch64.<clinit>":
6667
// Exempted cases
6768
return;
6869
default:
@@ -80,7 +81,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
8081

8182
if (potentialScratchRegisters.contains(f.getName())) {
8283
throw new VerificationError("Access to %s register at callsite %s is prohibited.",
83-
f, method.format("%H.%n(%p)"), f);
84+
f.format("%H.%n"), method.format("%H.%n(%p)"), f);
8485
}
8586
}
8687
}

0 commit comments

Comments
 (0)