Skip to content

[Support] Avoid setting minor/subminor/build in VersionTuple::withMajorReplaced #139318

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

Merged
merged 2 commits into from
May 9, 2025
Merged

[Support] Avoid setting minor/subminor/build in VersionTuple::withMajorReplaced #139318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a733c0
[llvm][Support] Avoid setting minor/subminor/build in
cyndyishida May 9, 2025
19e91ec
Fix tests
cyndyishida May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clang/test/Driver/xros-driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
// LINK: "-platform_version" "xros" "1.0.0" "1.0.0"
// LINK-SIM: "-platform_version" "xros-simulator" "1.0.0" "1.0.0"

// OBJC-RUNTIME: "-fobjc-runtime=ios-17.0.0.0"
// OBJC-RUNTIME2: "-fobjc-runtime=ios-18.0.0.0"
// OBJC-RUNTIME: "-fobjc-runtime=ios-17.0.0"
// OBJC-RUNTIME2: "-fobjc-runtime=ios-18.0.0"
// ARC-NOT: error:

// SSP_ON: "-stack-protector" "1"
Expand Down
4 changes: 1 addition & 3 deletions llvm/include/llvm/Support/VersionTuple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ class VersionTuple {

/// Return a version tuple that contains a different major version but
/// everything else is the same.
VersionTuple withMajorReplaced(unsigned NewMajor) const {
return VersionTuple(NewMajor, Minor, Subminor, Build);
}
VersionTuple withMajorReplaced(unsigned NewMajor) const;

/// Return a version tuple that contains only components that are non-zero.
VersionTuple normalize() const {
Expand Down
10 changes: 10 additions & 0 deletions llvm/lib/Support/VersionTuple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,13 @@ bool VersionTuple::tryParse(StringRef input) {
*this = VersionTuple(major, minor, micro, build);
return false;
}

VersionTuple VersionTuple::withMajorReplaced(unsigned NewMajor) const {
if (HasBuild)
return VersionTuple(NewMajor, Minor, Subminor, Build);
if (HasSubminor)
return VersionTuple(NewMajor, Minor, Subminor);
if (HasMinor)
return VersionTuple(NewMajor, Minor);
return VersionTuple(NewMajor);
}
30 changes: 30 additions & 0 deletions llvm/unittests/Support/VersionTupleTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,33 @@ TEST(VersionTuple, tryParse) {
EXPECT_TRUE(VT.tryParse("1 "));
EXPECT_TRUE(VT.tryParse("."));
}

TEST(VersionTuple, withMajorReplaced) {
VersionTuple VT(2);
VersionTuple ReplacedVersion = VT.withMajorReplaced(7);
EXPECT_FALSE(ReplacedVersion.getMinor().has_value());
EXPECT_FALSE(ReplacedVersion.getSubminor().has_value());
EXPECT_FALSE(ReplacedVersion.getBuild().has_value());
EXPECT_EQ(VersionTuple(7), ReplacedVersion);

VT = VersionTuple(100, 1);
ReplacedVersion = VT.withMajorReplaced(7);
EXPECT_TRUE(ReplacedVersion.getMinor().has_value());
EXPECT_FALSE(ReplacedVersion.getSubminor().has_value());
EXPECT_FALSE(ReplacedVersion.getBuild().has_value());
EXPECT_EQ(VersionTuple(7, 1), ReplacedVersion);

VT = VersionTuple(101, 11, 12);
ReplacedVersion = VT.withMajorReplaced(7);
EXPECT_TRUE(ReplacedVersion.getMinor().has_value());
EXPECT_TRUE(ReplacedVersion.getSubminor().has_value());
EXPECT_FALSE(ReplacedVersion.getBuild().has_value());
EXPECT_EQ(VersionTuple(7, 11, 12), ReplacedVersion);

VT = VersionTuple(101, 11, 12, 2);
ReplacedVersion = VT.withMajorReplaced(7);
EXPECT_TRUE(ReplacedVersion.getMinor().has_value());
EXPECT_TRUE(ReplacedVersion.getSubminor().has_value());
EXPECT_TRUE(ReplacedVersion.getBuild().has_value());
EXPECT_EQ(VersionTuple(7, 11, 12, 2), ReplacedVersion);
}
Loading