Skip to content

Conversation

@qiongsiwu
Copy link

@qiongsiwu qiongsiwu commented Nov 13, 2025

This PR cherry-picks llvm#164345 to stable/21.x, and fixes two bugs introduced when it was merged into next.

qiongsiwu and others added 3 commits November 13, 2025 13:28
 Conflicts:
	clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
	clang/lib/Frontend/FrontendActions.cpp
	clang/lib/Tooling/DependencyScanning/DependencyScannerImpl.cpp
	clang/lib/Tooling/DependencyScanning/DependencyScannerImpl.h
	clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp
	clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
	clang/tools/clang-scan-deps/ClangScanDeps.cpp

(cherry picked from commit 97f12f9)

 Conflicts:
	clang/include/clang/Frontend/FrontendActions.h
	clang/lib/Frontend/FrontendActions.cpp
…preserve the stable dirs and correctly setup the action controller for by name lookups.
This patch fixes:

  clang/lib/Tooling/DependencyScanning/DependencyScannerImpl.cpp:733:10:
  error: unused variable 'ArgSize' [-Werror,-Wunused-variable]

  clang/lib/Tooling/DependencyScanning/DependencyScannerImpl.cpp:735:15:
  error: unused variable 'FirstArg' [-Werror,-Wunused-variable]

(cherry picked from commit 8552a8f)
@qiongsiwu
Copy link
Author

@swift-ci please test

@qiongsiwu
Copy link
Author

@swift-ci please test llvm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants