Skip to content

Cherry pick CAS windows patches into stable #11585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 13 commits into from
Oct 9, 2025
Merged

Cherry pick CAS windows patches into stable #11585

merged 13 commits into from
Oct 9, 2025

Conversation

hjyamauchi
Copy link

No description provided.

@hjyamauchi
Fix the following CAS-related tests with LLVM_ENABLE_ONDISK_CAS=OFF o…
08acc72 
…n Windows (llvm#11140)

Clang :: ClangScanDeps/modules-include-tree-pch-common-stale.c
Clang :: Driver/fdepscan-prefix-map-sdk.c
Clang :: Driver/fdepscan-prefix-map-toolchain.c
Clang :: Driver/fdepscan-prefix-map.c
Clang-Unit :: ./AllClangUnitTests.exe/DependencyScanningCASFilesystem/DirectiveScanFailure
Clang-Unit :: ./AllClangUnitTests.exe/DependencyScanningCASFilesystem/FilenameSpelling
Clang-Unit :: ./AllClangUnitTests.exe/IncludeTree/IncludeTreeFileSystemOverlay
Clang-Unit :: ./AllClangUnitTests.exe/IncludeTree/IncludeTreeScan
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/BasicRealFSIteration
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/BasicRealFSRecursiveIteration
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/BasicRealFSRecursiveIterationNoPush
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/BrokenSymlinkRealFSIteration
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/BrokenSymlinkRealFSRecursiveIteration
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/ExcludeFromTacking
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/Exists
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/MultipleWorkingDirs
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/TrackNewAccesses
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/TrackNewAccessesExists
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/TrackNewAccessesStack
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/caseSensitivityDir
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/caseSensitivityFile
LLVM-Unit :: CAS/./CASTests.exe/CachingOnDiskFileSystemTest/getRealPath
LLVM-Unit :: CAS/./CASTests.exe/OnDiskCASLoggerTest/MultiProcess
LLVM-Unit :: CAS/./CASTests.exe/OnDiskCASLoggerTest/MultiThread
LLVM-Unit :: Support/./SupportTests.exe/OnDiskBackendTest/OnlyIfDifferent
LLVM-Unit :: Support/./SupportTests.exe/SourceMgrTest/AddIncludedFile
LLVM-Unit :: Support/./SupportTests.exe/TreePathPrefixMapperTest/map
LLVM-Unit :: Support/./SupportTests.exe/TreePathPrefixMapperTest/mapInPlace
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/Keep/OnDisk
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/Keep/OnDisk_DisableRemoveOnSignal
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepEmpty/OnDisk
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepEmpty/OnDisk_DisableRemoveOnSignal
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepFlush/OnDisk
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepFlush/OnDisk_DisableRemoveOnSignal
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepFlushProxy/OnDisk
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepFlushProxy/OnDisk_DisableRemoveOnSignal
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectory/OnDisk
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectory/OnDisk_DisableRemoveOnSignal
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectory/OnDisk_DisableTemporaries
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectoryNested/OnDisk
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectoryNested/OnDisk_DisableRemoveOnSignal
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectoryNested/OnDisk_DisableTemporaries
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectoryNoImply/OnDisk
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectoryNoImply/OnDisk_DisableRemoveOnSignal
LLVM-Unit :: Support/./SupportTests.exe/VirtualOutput/BackendTest/KeepMissingDirectoryNoImply/OnDisk_DisableTemporaries

(cherry picked from commit 506713c)
@hjyamauchi
Fix the following CAS-related tests with LLVM_ENABLE_ONDISK_CAS=ON on…
b43d666 
… Windows (llvm#11194)

Clang :: ClangScanDeps/include-tree-multiple-commands.c
Clang :: ClangScanDeps/include-tree-pragma-system-header.c
Clang :: ClangScanDeps/include-tree-preserve-pch-path.c
Clang :: ClangScanDeps/modules-include-tree-api-notes.c
Clang :: ClangScanDeps/modules-include-tree-by-mod-name.c
Clang :: ClangScanDeps/modules-include-tree-dependency-file.c
Clang :: ClangScanDeps/modules-include-tree-diag-opts.c
Clang :: ClangScanDeps/modules-include-tree-export-as.c
Clang :: ClangScanDeps/modules-include-tree-exports.c
Clang :: ClangScanDeps/modules-include-tree-has-include-umbrella-header.c
Clang :: ClangScanDeps/modules-include-tree-implementation-private.c
Clang :: ClangScanDeps/modules-include-tree-implementation-transitive.c
Clang :: ClangScanDeps/modules-include-tree-implementation-via-spurious.c
Clang :: ClangScanDeps/modules-include-tree-pch-common-stale.c
Clang :: ClangScanDeps/modules-include-tree-sdk-settings.c
Clang :: ClangScanDeps/modules-include-tree-vfsoverlay.c
Clang :: ClangScanDeps/optimize-vfs-pch-tree.m
Clang-Unit :: ./AllClangUnitTests.exe/8/48 DependencyScanningCASFilesystem.FilenameSpelling
Clang-Unit :: ./AllClangUnitTests.exe/9/48 DependencyScanningCASFilesystem.DirectiveScanFailure
LLVM-Unit :: CAS/./CASTests.exe/19/38 InMemoryCAS/CASTest.ActionCacheAsync
LLVM-Unit :: CAS/./CASTests.exe/30/38 OnDiskCAS/CASTest.ActionCacheAsync
LLVM-Unit :: CAS/./CASTests.exe/CASConfigurationTest/configFileSearch
LLVM-Unit :: CAS/./CASTests.exe/OnDiskCASLoggerTest/MultiProcess
LLVM-Unit :: CAS/./CASTests.exe/OnDiskCASTest/BlobsBigParallelMultiCAS
LLVM-Unit :: CAS/./CASTests.exe/OnDiskCASTest/BlobsParallelMultiCAS
LLVM-Unit :: CAS/./CASTests.exe/PluginCASTest/isMaterialized

(Cherry picked from commit ba40553)
@hjyamauchi
Fix the following CAS-related tests on Windows (llvm#11236)
3792727 
Clang :: ClangScanDeps/include-tree.c
Clang :: ClangScanDeps/modules-cas-context-hash.c
Clang :: ClangScanDeps/modules-cas-full-by-mod-name.c
Clang :: ClangScanDeps/modules-cas-module-cache-hash.c
Clang :: ClangScanDeps/modules-cas-trees-exclude-files-from-casfs.c
Clang :: ClangScanDeps/modules-include-tree-implementation.c
Clang :: ClangScanDeps/modules-include-tree-inferred.m
Clang :: ClangScanDeps/modules-include-tree-missing-submodule.c
Clang :: ClangScanDeps/modules-include-tree-pch-with-private.c
Clang :: ClangScanDeps/modules-include-tree-submodules.c
Clang :: ClangScanDeps/modules-include-tree-with-pch.c
Clang :: ClangScanDeps/modules-include-tree-working-directory.c
Clang :: ClangScanDeps/modules-include-tree.c
Clang :: Index/Core/scan-deps-cas.m
LLVM :: tools/llvm-cas/merge.test
LLVM :: tools/llvm-cas/print-id.test
LLVM :: tools/llvm-cas/validation.test

(Cherry picked from commit 78d4387)
@hjyamauchi
Implement more precise path matching in some CAS tests (llvm#11262)
9b631db 
(Cherry picked from commit 152cf61)
@hjyamauchi
Fix the following CAS-related tests on Windows (llvm#11291)
0cbdb4b 
Clang :: ClangScanDeps/cas-trees.c
Clang :: ClangScanDeps/modules-availability-check.c
Clang :: ClangScanDeps/modules-cas-fs-vfsoverlay.c
Clang :: ClangScanDeps/modules-cas-implicit-module-cache.c
Clang :: ClangScanDeps/modules-cas-trees-cwd.c
Clang :: ClangScanDeps/modules-cas-trees-input-files.c
Clang :: ClangScanDeps/modules-cas-trees-with-pch.c
Clang :: ClangScanDeps/modules-cas-trees.c

(Cherry picked from commit bce8dbd)
@hjyamauchi
Fix the following CAS-related tests on Windows (llvm#11320)
ae63caf 
Clang :: ClangScanDeps/cas-case-sensitivity.c
Clang :: ClangScanDeps/cas-fs-multiple-commands.c
Clang :: ClangScanDeps/include-tree-preserve-pch-path.c

(Cherry picked from commit 9cf17f4)
@hjyamauchi
Fix ExecuteAndWait with empty environment on Windows (llvm#158719)
06cca97 
CreateProcessW requires that the environemnt block to be always double
null-terminated even with an empty environemnt.

https://learn.microsoft.com/en-us/windows/win32/procthread/environment-variables

The attached test fails this way without the fix.

C:\Users\hiroshi\upstream\llvm-project\llvm\unittests\Support\ProgramTest.cpp(697):
error: Value of: ExecutionFailed
  Actual: true
  Expected: false
Couldn't execute program
'C:\Users\hiroshi\upstream\llvm-project\build\unittests\Support\SupportTests.exe':
The parameter is incorrect. (0x57)

(Cherry picked from commit 81c55e6)
@hjyamauchi
Fix the following CAS related tests for Windows (llvm#11355)
ad05b82 
Clang :: ClangScanDeps/cas-fs-prefix-mapping.c
Clang :: ClangScanDeps/include-tree-prefix-mapping-pch-remap.c
Clang :: ClangScanDeps/include-tree-prefix-mapping.c
Clang :: ClangScanDeps/modules-cas-fs-prefix-mapping-caching.c
Clang :: ClangScanDeps/modules-cas-fs-prefix-mapping.c
Clang :: ClangScanDeps/modules-include-tree-prefix-map.c
Clang :: ClangScanDeps/modules-pch-cas-fs-prefix-mapping-caching.c
Clang :: ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c

(Cherry picked from commit 8de16d1)
@hjyamauchi
Fix the OnDiskCASLoggerTest/MultiProcess test on Windows (llvm#11395)
fed785f 
LLVM-Unit :: CAS/./CASTests.exe/OnDiskCASLoggerTest/MultiProcess

(Cherry picked from commit fccf510)
@hjyamauchi
Fix the following CAS related tests for Windows (llvm#11458)
d23a5d3 
LLVM :: tools/llvm-cas/ingest-remap.test
LLVM :: tools/llvm-cas/ingest.test

(Cherry picked from commit acf50a4)
@hjyamauchi
Fix the following CAS related test for Windows (llvm#11494)
dcd444e 
Clang :: ClangScanDeps/include-tree-with-pch.c

(Cherry picked from commit 9a08d92)
@hjyamauchi
Fix the following CAS related test for Windows (llvm#11475)
05c1f52 
Clang :: ClangScanDeps/include-tree-working-directory.c

(Cherry picked from commit 16f18a3)
@hjyamauchi
CAS fixes for clang cl mode. (llvm#11568)
29c5214 
Three changes:
- Make depscan flags visible.
- Fix an issue that a depscan reponse file is written in the current
directory without a unique id/hash in its path, collides with another
for an identical source file and causes a build error.
- Fix an issue that causes unexpected cas cache misses due to a temp
depscan reponse file path (with a unique id/hash) being specified
(incorrectly/unnecessarily) specified as the output object file (the
-object-file-name flag) when for code view / pdb debug info is
emitted.

(Cherry picked from commit f7af125)
@hjyamauchi
Copy link
Author

@swift-ci please test

@hjyamauchi
Copy link
Author

@swift-ci please test macos platform

1 similar comment
@hjyamauchi
Copy link
Author

@swift-ci please test macos platform

@hjyamauchi hjyamauchi marked this pull request as ready for review October 9, 2025 00:42
@hjyamauchi hjyamauchi mentioned this pull request Oct 9, 2025
Merged
cachemeifyoucan
cachemeifyoucan reviewed Oct 9, 2025
View reviewed changes
Copy link

@cachemeifyoucan cachemeifyoucan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM. As long as CI passes.

llvm/unittests/CAS/ActionCacheTest.cpp
ASSERT_THAT_ERROR(CAS1->createProxy({}, "2").moveInto(ID2), Succeeded());
ASSERT_THAT_ERROR(CAS2->createProxy({}, "1").moveInto(ID3), Succeeded());

#if !defined(LLVM_ENABLE_ONDISK_CAS)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might need to revisit this change.

@hjyamauchi hjyamauchi merged commit eff752e into swiftlang:stable/21.x Oct 9, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cachemeifyoucan cachemeifyoucan cachemeifyoucan approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hjyamauchi @cachemeifyoucan