Skip to content

Commit 6632f4f

Browse files
author
duke
committedApr 16, 2022
Automatic merge of jdk:master into master
2 parents 0cc92e4 + 21de4e5 commit 6632f4f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

‎test/hotspot/jtreg/compiler/c2/aarch64/TestFarJump.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ static boolean containsADRP(String input) {
7474
}
7575
int dump = (int)Long.parseLong(match, 16);
7676
int encoding = Integer.reverseBytes(dump);
77-
if (isADRP(encoding)) {
78-
return true;
79-
}
77+
// Check the first instruction only. The raw pointer can be confused with the encoded adrp instruction:
78+
// emit_exception_handler() = far_call() + should_not_reach_here() = ADRP + ADD + BLR + DCPS1 + raw_pointer
79+
return isADRP(encoding);
8080
}
8181
return false;
8282
}

0 commit comments

Comments
 (0)
Please sign in to comment.