8317340: Windows builds are not reproducible if MS VS compiler install path differs#16008
8317340: Windows builds are not reproducible if MS VS compiler install path differs#16008andrew-m-leonard wants to merge 1 commit intoopenjdk:masterfrom
Conversation
…l path differs Signed-off-by: Andrew Leonard <anleonar@redhat.com>
|
👋 Welcome back aleonard! A progress list of the required criteria for merging this PR into |
|
@andrew-m-leonard The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
|
What effect will this have on debugging? |
Hi @erikj79 jdk/make/autoconf/jdk-options.m4 Line 696 in 2637e8d |
|
jdk/make/autoconf/flags-cflags.m4 Line 830 in 2637e8d |
Yes, I'm aware of that. I was just curious if you had tested and investigated the consequences of doing this when trying to debug a "release" build. I'm not against this change, but it would be good to understand any consequences. |
Ah I see :-) |
|
@erikj79 I shall run a debug session on a release image and see what if anything it causes. |
@erikj79 So I started up a VS2022 debugging session for a java.exe process, and the vcruntime140 debugging information is loaded via the Microsoft Symbol Server anyway, same with debug src. Your VS2022 tools debugging source PATH for the VC tools is also pointing at your local VS2022 include folder. |
|
@erikj79 So done some debugging of the main Java os_windows.cpp thread and debugging is fine, openjdk pdb's loaded fine, and vcruntime symbols loaded from Symbol Server. Also, did a debug session without these changes, and all behaves identically. |
|
@andrew-m-leonard This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: 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 17 new commits pushed to the
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 |
|
/integrate |
|
Going to push as commit 353d139.
Your commit was automatically rebased without conflicts. |
|
@andrew-m-leonard Pushed as commit 353d139. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
|
It looks like this change broke the build on WSL. The pathtool in WSL (wslpath) does not support the |
When doing a reproducible Windows build on two different machines, that
happen to have MS Visual Studio installed in different paths, the resulting
builds are not identical. This is due to the System include paths, eg:
appearing in the compiler obj as part of debug info.
This PR tests when doing a Windows no-Absolute paths allowed build, and then
adds -pathmap:<VS_include_long_path>=vsi entries to re-map those entries in
the compiler object.
The VS cl compiler generates these paths as standard Windows "long path" entries,
and must be pathmap'd as such.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/16008/head:pull/16008$ git checkout pull/16008Update a local copy of the PR:
$ git checkout pull/16008$ git pull https://git.openjdk.org/jdk.git pull/16008/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 16008View PR using the GUI difftool:
$ git pr show -t 16008Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/16008.diff
Webrev
Link to Webrev Comment