Merge branch 'master' of http://github.com/openjdk/jdk into JDK-8346236

Author: Jatin Bhateja

.github/actions/get-gtest/action.yml

@@ -49,6 +49,6 @@ runs:
     - name: 'Export path to where GTest is installed'
       id: path-name
       run: |
-        # Export the path
-        echo 'path=gtest' >> $GITHUB_OUTPUT
+        # Export the absolute path
+        echo "path=`pwd`/gtest" >> $GITHUB_OUTPUT
       shell: bash

.github/actions/get-jtreg/action.yml

@@ -49,6 +49,6 @@ runs:
     - name: 'Export path to where JTReg is installed'
       id: path-name
       run: |
-        # Export the path
-        echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
+        # Export the absolute path
+        echo "path=`pwd`/jtreg/installed" >> $GITHUB_OUTPUT
       shell: bash

.github/workflows/main.yml

@@ -325,17 +325,6 @@ jobs:
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
 
-  test-macos-x64:
-    name: macos-x64
-    needs:
-      - build-macos-x64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: macos-x64
-      bootjdk-platform: macos-x64
-      runs-on: macos-13
-      xcode-toolset-version: '14.3.1'
-
   test-macos-aarch64:
     name: macos-aarch64
     needs:

.jcheck/conf

@@ -4,7 +4,7 @@ jbs=JDK
 version=25
 
 [checks]
-error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
+error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright
 warning=issuestitle,binary
 
 [repository]
@@ -34,3 +34,8 @@ pattern=^([124-8][0-9]{6}): (\S.*)$
 
 [checks "problemlists"]
 dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp
+
+[checks "copyright"]
+files=^(?!LICENSE|license\.txt|.*\.bin|.*\.gif|.*\.jpg|.*\.png|.*\.icon|.*\.tiff|.*\.dat|.*\.patch|.*\.wav|.*\.class|.*-header|.*\.jar).*
+oracle_locator=.*Copyright \(c\)(.*)Oracle and/or its affiliates\. All rights reserved\.
+oracle_validator=.*Copyright \(c\) (\d{4})(?:, (\d{4}))?, Oracle and/or its affiliates\. All rights reserved\.

Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2025, 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
@@ -24,8 +24,9 @@
 #
 
 ###
-### This file is just a very small wrapper needed to run the real make/Init.gmk.
-### It also performs some sanity checks on make.
+### This file is just a very small wrapper which will include make/PreInit.gmk,
+### where the real work is done. This wrapper also performs some sanity checks
+### on make that must be done before we can include another file.
 ###
 
 # The shell code below will be executed on /usr/bin/make on Solaris, but not in GNU Make.
@@ -58,7 +59,7 @@ ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
 else
   makefile_path := $(lastword $(MAKEFILE_LIST))
 endif
-topdir := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
+TOPDIR := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
 
-# ... and then we can include the real makefile
-include $(topdir)/make/Init.gmk
+# ... and then we can include the real makefile to bootstrap the build
+include $(TOPDIR)/make/PreInit.gmk

bin/idea.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2025, 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
@@ -99,7 +99,7 @@ if [ "$VERBOSE" = "true" ] ; then
   echo "idea template dir: $IDEA_TEMPLATE"
 fi
 
-cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make idea-gen-config ALLOW=IDEA_OUTPUT,MODULES IDEA_OUTPUT=$IDEA_OUTPUT MODULES="$*" $CONF_ARG || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg

doc/hotspot-style.html

@@ -217,10 +217,10 @@ <h3 id="source-files">Source Files</h3>
 should be put in the .hpp file, and not in the .inline.hpp file. This
 rule exists to resolve problems with circular dependencies between
 .inline.hpp files.</p></li>
-<li><p>All .cpp files include precompiled.hpp as the first include
-line.</p></li>
-<li><p>precompiled.hpp is just a build time optimization, so don't rely
-on it to resolve include problems.</p></li>
+<li><p>Some build configurations use precompiled headers to speed up the
+build times. The precompiled headers are included in the precompiled.hpp
+file. Note that precompiled.hpp is just a build time optimization, so
+don't rely on it to resolve include problems.</p></li>
 <li><p>Keep the include lines alphabetically sorted.</p></li>
 <li><p>Put conditional inclusions (<code>#if ...</code>) at the end of
 the include list.</p></li>

doc/hotspot-style.md

@@ -150,10 +150,10 @@ the first include line. Declarations needed by other files should be put
 in the .hpp file, and not in the .inline.hpp file. This rule exists to
 resolve problems with circular dependencies between .inline.hpp files.
 
-* All .cpp files include precompiled.hpp as the first include line.
-
-* precompiled.hpp is just a build time optimization, so don't rely on
-it to resolve include problems.
+* Some build configurations use precompiled headers to speed up the
+build times. The precompiled headers are included in the precompiled.hpp
+file. Note that precompiled.hpp is just a build time optimization, so
+don't rely on it to resolve include problems.
 
 * Keep the include lines alphabetically sorted.
 

doc/hotspot-unit-tests.html

@@ -245,7 +245,7 @@ <h3 id="error-messages">Error messages</h3>
 <p>All GoogleTest asserts print compared expressions and their values,
 so there is no need to have them in error messages. Asserts print only
 compared values, they do not print any of interim variables, e.g.
-<code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8)) || i == 18)</code>
+<code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8))) || i == 18)</code>
 prints only one value. If you use some complex predicates, please
 consider <code>EXPECT_PRED*</code> or <code>EXPECT_FORMAT_PRED</code>
 assertions family, they check that a predicate returns true/success and

doc/hotspot-unit-tests.md

@@ -172,7 +172,7 @@ Provide informative, but not too verbose error messages.
 All GoogleTest asserts print compared expressions and their values, so
 there is no need to have them in error messages. Asserts print only
 compared values, they do not print any of interim variables, e.g.
-`ASSERT_TRUE((val1 == val2 && isFail(foo(8)) || i == 18)` prints only
+`ASSERT_TRUE((val1 == val2 && isFail(foo(8))) || i == 18)` prints only
 one value. If you use some complex predicates, please consider
 `EXPECT_PRED*` or `EXPECT_FORMAT_PRED` assertions family, they check that
 a predicate returns true/success and print out all parameters values.