Skip to content

Commit 9d4e84f

Browse files
committed
8259565: Zero: compiler/runtime/criticalnatives fails because CriticalJNINatives is not supported
Reviewed-by: coleenp, zgu
1 parent 98ccfbf commit 9d4e84f

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/hotspot/cpu/zero/vm_version_zero.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "precompiled.hpp"
2727
#include "assembler_zero.inline.hpp"
2828
#include "memory/resourceArea.hpp"
29+
#include "runtime/arguments.hpp"
2930
#include "runtime/globals_extension.hpp"
3031
#include "runtime/java.hpp"
3132
#include "runtime/stubCodeGenerator.hpp"
@@ -43,4 +44,7 @@ void VM_Version::initialize() {
4344
warning("Prefetching is not available for a Zero VM");
4445
}
4546
FLAG_SET_DEFAULT(AllocatePrefetchDistance, 0);
47+
48+
// Not implemented
49+
UNSUPPORTED_OPTION(CriticalJNINatives);
4650
}

test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption/CheckLongArgs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/* @test
2626
* @bug 8167409
27-
* @requires (os.arch != "aarch64") & (os.arch != "arm")
27+
* @requires (os.arch != "aarch64") & (os.arch != "arm") & (vm.flavor != "zero")
2828
* @run main/othervm/native -Xcomp -XX:+CriticalJNINatives compiler.runtime.criticalnatives.argumentcorruption.CheckLongArgs
2929
*/
3030
package compiler.runtime.criticalnatives.argumentcorruption;

test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup/LookUp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/* @test
2626
* @bug 8167408
27-
* @requires (os.arch != "aarch64") & (os.arch != "arm")
27+
* @requires (os.arch != "aarch64") & (os.arch != "arm") & (vm.flavor != "zero")
2828
* @run main/othervm/native -Xcomp -XX:+CriticalJNINatives compiler.runtime.criticalnatives.lookup.LookUp
2929
*/
3030
package compiler.runtime.criticalnatives.lookup;

0 commit comments

Comments
 (0)