Use default instead of a specific case to fix the MSVC warning in sysinfo.cc#149159
Merged
dpaoliello merged 1 commit intollvm:mainfrom Jul 16, 2025
Merged
Use default instead of a specific case to fix the MSVC warning in sysinfo.cc#149159dpaoliello merged 1 commit intollvm:mainfrom
dpaoliello merged 1 commit intollvm:mainfrom
Conversation
Member
|
@llvm/pr-subscribers-third-party-benchmark Author: Daniel Paoliello (dpaoliello) Changes#147357 attempted to fix an MSVC in sysinfo.cc by adding a However, this resulted in CI failures: The root cause is that the enum being switched on is defined in the Windows SDK, so depending on which version of the SDK you are using The correct fix here is to use a Full diff: https://github.com/llvm/llvm-project/pull/149159.diff 1 Files Affected:
diff --git a/third-party/benchmark/src/sysinfo.cc b/third-party/benchmark/src/sysinfo.cc
index 837be8f9cf891..d1ae6cc82b943 100644
--- a/third-party/benchmark/src/sysinfo.cc
+++ b/third-party/benchmark/src/sysinfo.cc
@@ -371,7 +371,7 @@ std::vector<CPUInfo::CacheInfo> GetCacheSizesWindows() {
case CacheTrace:
C.type = "Trace";
break;
- case CacheUnknown:
+ default:
C.type = "Unknown";
break;
}
|
Collaborator
|
If this will fix the Windows build, can we get this in soon? My Windows bot is still failing and I'd like to get it green again: https://lab.llvm.org/buildbot/#/builders/46 |
Collaborator
|
Thank you for the quick fix! |
This was referenced Jul 23, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#147357 attempted to fix an MSVC in sysinfo.cc by adding a
caseblock for a missing enum value.However, this resulted in CI failures:
The root cause is that the enum being switched on is defined in the Windows SDK, so depending on which version of the SDK you are using
CacheUnknownmay or may not be defined.The correct fix here is to use a
defaultblock in the switch statement instead.