8388811: [8u] VS2010 build broken by JDK-8374058

[gnu-andrew]

JDK-8374058, part of the 8u502 security changes, broke the build on Visual Studio 2010 by introducing a variable declaration in the middle of the function.

Moving it to the top of the function fixes the issue. I've confirmed this locally with gcc using -Werror=declaration-after-statement.

diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
index dc140de77f..177a734594 100644
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
@@ -741,7 +741,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
     OPTIMIZATION := HIGHEST, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
-        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
+    	-Werror=declaration-after-statement, \
     MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \

As a follow-on, I intend to look at whether we can introduce -Werror=declaration-after-statement to gcc builds so we can catch instances in shared code without requiring a Visual Studio 2010 build. This is at least the third instance of such breakage.

---

• I confirm that I make this contribution in accordance with the OpenJDK Interim AI Policy.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• JDK-8388811 needs maintainer approval

Issue

• JDK-8388811: [8u] VS2010 build broken by JDK-8374058 (Bug - P4 - Approved)

Reviewers

• Thomas Fitzsimmons (@fitzsim - no project role)
• Christoph Langer (@RealCLanger - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/843/head:pull/843
$ git checkout pull/843

Update a local copy of the PR:
$ git checkout pull/843
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/843/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 843

View PR using the GUI difftool:
$ git pr show -t 843

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/843.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@gnu-andrew This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8388811: [8u] VS2010 build broken by JDK-8374058

Reviewed-by: fitzsim, clanger

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

• aa3f9de: 8388142: [8u] Path to PreferredKey.java exclusion is wrong
• e076e19: 8369032: Add test to ensure serialized ICC_Profile stores only necessary optional data
• ca6d5fd: 8385390: Update FreeType to 2.14.3

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[mlbridge]

Webrevs

• 00: Full (251d8515)

[fitzsim]

I am not a Reviewer.

This is the exact same fix I did in the context of #835 before looking for and immediately finding this pull request:

https://github.com/fitzsim/jdk8u-dev/actions/runs/30028355752/job/89278670891

fitzsim@7bfa66f

Fixing the compiler option would have eliminated the need for a similar patch on #835, so it seems like a nice thing to have, generally:

b30bea0

[openjdk]

⚠️ @gnu-andrew This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[gnu-andrew]

Thanks Christoph!
/approval request Simple fix of a case of declaration after statement in C code introduced in the 2026-07 security patches, which breaks the build on C90 (Visual Studio 2010) compilers. The patch was reviewed by Christoph Langer & Thomas Fitzsimmons and the GitHub Actions VS2010 build now succeeds.

[openjdk]

@gnu-andrew
8388811: The approval request has been created successfully.

[jerboaa]

/approve yes

[openjdk]

@jerboaa
8388811: The approval request has been approved.

[gnu-andrew]

/integrate

[openjdk]

Going to push as commit 0830f61.
Since your change was applied there have been 3 commits pushed to the master branch:

• aa3f9de: 8388142: [8u] Path to PreferredKey.java exclusion is wrong
• e076e19: 8369032: Add test to ensure serialized ICC_Profile stores only necessary optional data
• ca6d5fd: 8385390: Update FreeType to 2.14.3

Your commit was automatically rebased without conflicts.

[openjdk]

@gnu-andrew Pushed as commit 0830f61.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.