stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2023-01-07 02:05:59 +00:00
commit 5393dc9a48
10 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
make/conf/jib-profiles.js
View File

@ -944,7 +944,7 @@ var getJibProfilesProfiles = function (input, common, data) {
target_cpu: input.build_cpu,
dependencies: [
"jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJdk,
testedProfileTest, testedProfile + ".jdk_symbols",
testedProfileTest,
],
src: "src.conf",
make_args: testOnlyMake,
@ -958,6 +958,9 @@ var getJibProfilesProfiles = function (input, common, data) {
labels: "test"
}
};
if (!testedProfile.endsWith("-jcov")) {
testOnlyProfilesPrebuilt["run-test-prebuilt"]["dependencies"].push(testedProfile + ".jdk_symbols");
}
// If actually running the run-test-prebuilt profile, verify that the input
// variable is valid and if so, add the appropriate target_* values from

1
src/java.base/share/classes/java/lang/foreign/Linker.java
View File

@ -345,6 +345,7 @@ public sealed interface Linker permits AbstractLinker {
* }
* }
*/
@PreviewFeature(feature=PreviewFeature.Feature.FOREIGN)
sealed interface CaptureCallState extends Option
permits LinkerOptions.CaptureCallStateImpl {
/**

2
src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/linux/LinuxAArch64VaList.java
View File

@ -129,7 +129,7 @@ public non-sealed class LinuxAArch64VaList implements VaList {
}
private static MemorySegment emptyListAddress() {
MemorySegment ms = MemorySegment.allocateNative(LAYOUT, SegmentScope.auto());
MemorySegment ms = MemorySegment.allocateNative(LAYOUT, SegmentScope.global());
VH_stack.set(ms, MemorySegment.NULL);
VH_gr_top.set(ms, MemorySegment.NULL);
VH_vr_top.set(ms, MemorySegment.NULL);

2
src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVVaList.java
View File

@ -138,7 +138,7 @@ public non-sealed class SysVVaList implements VaList {
}
private static MemorySegment emptyListAddress() {
MemorySegment base = MemorySegment.allocateNative(LAYOUT, SegmentScope.auto());
MemorySegment base = MemorySegment.allocateNative(LAYOUT, SegmentScope.global());
VH_gp_offset.set(base, MAX_GP_OFFSET);
VH_fp_offset.set(base, MAX_FP_OFFSET);
VH_overflow_arg_area.set(base, MemorySegment.NULL);

8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,6 +37,7 @@ import com.sun.source.doctree.SeeTree;
import jdk.javadoc.doclet.Taglet.Location;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
import jdk.javadoc.internal.doclets.toolkit.util.DocFinder.Result;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@ -51,7 +52,10 @@ public class SeeTaglet extends BaseTaglet implements InheritableTaglet {
@Override
public Output inherit(Element owner, DocTree tag, boolean isFirstSentence, BaseConfiguration configuration) {
throw new UnsupportedOperationException("Not yet implemented");
CommentHelper ch = configuration.utils.getCommentHelper(owner);
var path = ch.getDocTreePath(tag);
configuration.getMessages().warning(path, "doclet.inheritDocWithinInappropriateTag");
return new Output(null, null, List.of(), true /* true, otherwise there will be an exception up the stack */);
}
@Override

8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SpecTaglet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ import com.sun.source.doctree.SpecTree;
import jdk.javadoc.doclet.Taglet.Location;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
import jdk.javadoc.internal.doclets.toolkit.util.DocFinder.Result;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@ -50,7 +51,10 @@ public class SpecTaglet extends BaseTaglet implements InheritableTaglet {
@Override
public Output inherit(Element owner, DocTree tag, boolean isFirstSentence, BaseConfiguration configuration) {
throw new UnsupportedOperationException("Not yet implemented");
CommentHelper ch = configuration.utils.getCommentHelper(owner);
var path = ch.getDocTreePath(tag);
configuration.getMessages().warning(path, "doclet.inheritDocWithinInappropriateTag");
return new Output(null, null, List.of(), true /* true, otherwise there will be an exception up the stack */);
}
@Override

12
test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -1204,6 +1204,16 @@ public class IRNode {
beforeMatchingNameRegex(XOR_V_MASK, "XorVMask");
}
public static final String XOR3_NEON = PREFIX + "XOR3_NEON" + POSTFIX;
static {
machOnlyNameRegex(XOR3_NEON, "veor3_neon");
}
public static final String XOR3_SVE = PREFIX + "XOR3_SVE" + POSTFIX;
static {
machOnlyNameRegex(XOR3_SVE, "veor3_sve");
}
/*
* Utility methods to set up IR_NODE_MAPPINGS.
*/

10
test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Arm Limited. All rights reserved.
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -78,8 +78,8 @@ public class TestEor3AArch64 {
// Test for eor3 Neon and SVE2 instruction for integers
@Test
@IR(counts = {"veor3_neon", "> 0"}, applyIf = {"MaxVectorSize", "16"}, applyIfCPUFeature = {"sha3", "true"})
@IR(counts = {"veor3_sve", "> 0"}, applyIfAnd = {"UseSVE", "2", "MaxVectorSize", "> 16"})
@IR(counts = {IRNode.XOR3_NEON, "> 0"}, applyIf = {"MaxVectorSize", "16"}, applyIfCPUFeature = {"sha3", "true"})
@IR(counts = {IRNode.XOR3_SVE, "> 0"}, applyIfAnd = {"UseSVE", "2", "MaxVectorSize", "> 16"})
public static void testIntEor3() {
for (int i = 0; i < LENGTH; i++) {
ir[i] = ia[i] ^ ib[i] ^ ic[i];
@ -96,8 +96,8 @@ public class TestEor3AArch64 {
// Test for eor3 Neon and SVE2 instruction for longs
@Test
@IR(counts = {"veor3_neon", "> 0"}, applyIf = {"MaxVectorSize", "16"}, applyIfCPUFeature = {"sha3", "true"})
@IR(counts = {"veor3_sve", "> 0"}, applyIfAnd = {"UseSVE", "2", "MaxVectorSize", "> 16"})
@IR(counts = {IRNode.XOR3_NEON, "> 0"}, applyIf = {"MaxVectorSize", "16"}, applyIfCPUFeature = {"sha3", "true"})
@IR(counts = {IRNode.XOR3_SVE, "> 0"}, applyIfAnd = {"UseSVE", "2", "MaxVectorSize", "> 16"})
public static void testLongEor3() {
for (int i = 0; i < LENGTH; i++) {
lr[i] = la[i] ^ lb[i] ^ lc[i];

4
test/jdk/java/foreign/valist/VaListTest.java
View File

@ -907,4 +907,8 @@ public class VaListTest extends NativeTestHelper {
assertThrows(NoSuchElementException.class, () -> nextVarg(vaList, next));
}
@Test(dataProvider = "emptyVaLists")
public void testEmptyVaListScope(VaList vaList) {
assertEquals(vaList.segment().scope(), SegmentScope.global());
}
}

17
test/langtools/jdk/javadoc/doclet/testInheritDocWithinInappropriateTag/TestInheritDocWithinInappropriateTag.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/*
* @test
* @bug 8284299 8287379
* @bug 8284299 8287379 8298525
* @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build toolbox.ToolBox javadoc.tester.*
@ -65,6 +65,9 @@ public class TestInheritDocWithinInappropriateTag extends JavadocTester {
* {@linkplain Object#hashCode() {@inheritDoc}}
*
* {@index term {@inheritDoc}}
*
* @see A {@inheritDoc}
* @spec http://example.com {@inheritDoc}
*/
@Override
public void x() { }
@ -95,6 +98,16 @@ public class TestInheritDocWithinInappropriateTag extends JavadocTester {
warning: @inheritDoc cannot be used within this tag
* {@index term {@inheritDoc}}
^
""",
"""
warning: @inheritDoc cannot be used within this tag
* @see A {@inheritDoc}
^
""",
"""
warning: @inheritDoc cannot be used within this tag
* @spec http://example.com {@inheritDoc}
^
""");
}