[PATCH] D143059: [NFC] Enable selecting multiple multilibs
michaelplatings updated this revision to Diff 499500.
michaelplatings marked 2 inline comments as done.
michaelplatings added a comment.
Rebase and apply changes requested by @peter.smith
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143059/new/
https://reviews.llvm.org/D143059
Files:
clang/include/clang/Driver/Multilib.h
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/Driver.cpp
clang/lib/Driver/Multilib.cpp
clang/lib/Driver/ToolChain.cpp
clang/lib/Driver/ToolChains/BareMetal.cpp
clang/lib/Driver/ToolChains/CSKYToolChain.cpp
clang/lib/Driver/ToolChains/Fuchsia.cpp
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Gnu.h
clang/lib/Driver/ToolChains/Hexagon.cpp
clang/lib/Driver/ToolChains/Hurd.cpp
clang/lib/Driver/ToolChains/Linux.cpp
clang/lib/Driver/ToolChains/MipsLinux.cpp
clang/lib/Driver/ToolChains/RISCVToolchain.cpp
clang/test/Driver/fuchsia.cpp
clang/unittests/Driver/MultilibBuilderTest.cpp
clang/unittests/Driver/MultilibTest.cpp
Index: clang/unittests/Driver/MultilibTest.cpp
===
--- clang/unittests/Driver/MultilibTest.cpp
+++ clang/unittests/Driver/MultilibTest.cpp
@@ -154,18 +154,18 @@
Multilib("/bar", {}, {}, {"+bar"}),
});
Multilib::flag_set Flags1 = {"+foo", "-bar"};
- Multilib Selection1;
+ llvm::SmallVector Selection1;
ASSERT_TRUE(MS.select(Flags1, Selection1))
<< "Flag set was {\"+foo\"}, but selection not found";
- ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
- << "Selection picked " << Selection1 << " which was not expected";
+ ASSERT_TRUE(Selection1.back().gccSuffix() == "/foo")
+ << "Selection picked " << Selection1.back() << " which was not expected";
Multilib::flag_set Flags2 = {"+foo", "+bar"};
- Multilib Selection2;
+ llvm::SmallVector Selection2;
ASSERT_TRUE(MS.select(Flags2, Selection2))
<< "Flag set was {\"+bar\"}, but selection not found";
- ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
- << "Selection picked " << Selection2 << " which was not expected";
+ ASSERT_TRUE(Selection2.back().gccSuffix() == "/bar")
+ << "Selection picked " << Selection2.back() << " which was not expected";
}
TEST(MultilibTest, SelectMultiple) {
@@ -173,17 +173,17 @@
Multilib("/a", {}, {}, {"x"}),
Multilib("/b", {}, {}, {"y"}),
});
- std::vector Selection;
+ llvm::SmallVector Selection;
- Selection = MS.select({"x"});
+ ASSERT_TRUE(MS.select({"x"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
- Selection = MS.select({"y"});
+ ASSERT_TRUE(MS.select({"y"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/b", Selection[0].gccSuffix());
- Selection = MS.select({"y", "x"});
+ ASSERT_TRUE(MS.select({"y", "x"}, Selection));
ASSERT_EQ(2u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
EXPECT_EQ("/b", Selection[1].gccSuffix());
@@ -383,7 +383,7 @@
TEST(MultilibTest, SelectSoft) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
Variants:
- Dir: s
@@ -402,7 +402,7 @@
TEST(MultilibTest, SelectSoftFP) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
Variants:
- Dir: f
@@ -418,7 +418,7 @@
// If hard float is all that's available then select that only if compiling
// with hard float.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
Variants:
- Dir: h
@@ -432,7 +432,7 @@
TEST(MultilibTest, SelectFloatABI) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
Variants:
- Dir: s
@@ -453,18 +453,18 @@
NoMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/f", Selected.gccSuffix());
+ EXPECT_EQ("/f", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest, SelectFloatABIReversed) {
// If soft is specified after softfp then softfp will never be
// selected because soft is compatible with softfp and last wins.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
Variants:
- Dir: h
@@ -485,11 +485,11 @@
NoMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
[PATCH] D143059: [NFC] Enable selecting multiple multilibs
michaelplatings updated this revision to Diff 496538.
michaelplatings added a comment.
Rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143059/new/
https://reviews.llvm.org/D143059
Files:
clang/include/clang/Driver/Multilib.h
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/Driver.cpp
clang/lib/Driver/Multilib.cpp
clang/lib/Driver/ToolChain.cpp
clang/lib/Driver/ToolChains/BareMetal.cpp
clang/lib/Driver/ToolChains/CSKYToolChain.cpp
clang/lib/Driver/ToolChains/Fuchsia.cpp
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Gnu.h
clang/lib/Driver/ToolChains/Hexagon.cpp
clang/lib/Driver/ToolChains/Hurd.cpp
clang/lib/Driver/ToolChains/Linux.cpp
clang/lib/Driver/ToolChains/MipsLinux.cpp
clang/lib/Driver/ToolChains/RISCVToolchain.cpp
clang/test/Driver/fuchsia.cpp
clang/unittests/Driver/MultilibBuilderTest.cpp
clang/unittests/Driver/MultilibTest.cpp
Index: clang/unittests/Driver/MultilibTest.cpp
===
--- clang/unittests/Driver/MultilibTest.cpp
+++ clang/unittests/Driver/MultilibTest.cpp
@@ -154,18 +154,18 @@
Multilib("/bar", {}, {}, {"+bar"}),
});
Multilib::flag_set Flags1 = {"+foo", "-bar"};
- Multilib Selection1;
+ llvm::SmallVector Selection1;
ASSERT_TRUE(MS.select(Flags1, Selection1))
<< "Flag set was {\"+foo\"}, but selection not found";
- ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
- << "Selection picked " << Selection1 << " which was not expected";
+ ASSERT_TRUE(Selection1.back().gccSuffix() == "/foo")
+ << "Selection picked " << Selection1.back() << " which was not expected";
Multilib::flag_set Flags2 = {"+foo", "+bar"};
- Multilib Selection2;
+ llvm::SmallVector Selection2;
ASSERT_TRUE(MS.select(Flags2, Selection2))
<< "Flag set was {\"+bar\"}, but selection not found";
- ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
- << "Selection picked " << Selection2 << " which was not expected";
+ ASSERT_TRUE(Selection2.back().gccSuffix() == "/bar")
+ << "Selection picked " << Selection2.back() << " which was not expected";
}
TEST(MultilibTest, SelectMultiple) {
@@ -173,17 +173,17 @@
Multilib("/a", {}, {}, {"x"}),
Multilib("/b", {}, {}, {"y"}),
});
- std::vector Selection;
+ llvm::SmallVector Selection;
- Selection = MS.select({"x"});
+ ASSERT_TRUE(MS.select({"x"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
- Selection = MS.select({"y"});
+ ASSERT_TRUE(MS.select({"y"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/b", Selection[0].gccSuffix());
- Selection = MS.select({"y", "x"});
+ ASSERT_TRUE(MS.select({"y", "x"}, Selection));
ASSERT_EQ(2u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
EXPECT_EQ("/b", Selection[1].gccSuffix());
@@ -382,7 +382,7 @@
TEST(MultilibTest, SelectSoft) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
variants:
- dir: s
@@ -401,7 +401,7 @@
TEST(MultilibTest, SelectSoftFP) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
variants:
- dir: f
@@ -417,7 +417,7 @@
// If hard float is all that's available then select that only if compiling
// with hard float.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
variants:
- dir: h
@@ -431,7 +431,7 @@
TEST(MultilibTest, SelectFloatABI) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
variants:
- dir: s
@@ -452,18 +452,18 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/f", Selected.gccSuffix());
+ EXPECT_EQ("/f", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest, SelectFloatABIReversed) {
// If soft is specified after softfp then softfp will never be
// selected because soft is compatible with softfp and last wins.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, YAML_PREAMBLE R"(
variants:
- dir: h
@@ -484,11 +484,11 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h",
[PATCH] D143059: [NFC] Enable selecting multiple multilibs
peter.smith added a comment.
A couple of small suggestions but otherwise looks good to me.
Comment at: clang/lib/Driver/ToolChains/BareMetal.cpp:233
+ std::string Result = computeBaseSysRoot(getDriver(), getTriple());
+ if (!SelectedMultilibs.empty()) {
+Result += SelectedMultilibs.back().osSuffix();
Nit: the braces can be omitted here. No strong opinion as it may be better to
keep consistency with the rest of the file rather than LLVM as a whole.
https://llvm.org/docs/CodingStandards.html#don-t-use-braces-on-simple-single-statement-bodies-of-if-else-loop-statements
Comment at: clang/lib/Driver/ToolChains/Fuchsia.cpp:319
+SelectedMultilibs.erase(SelectedMultilibs.begin(),
+SelectedMultilibs.end() - 1);
+
SelectedMultilibs.end() - 1 makes me a little nervous. This will work for the
current container type (I think the standard requires it for vector and I don't
think SmallVector would deviate from it. However in the unlikely event that the
container changes and this isn't valid then this could break.
Perhaps use std::advance(SelectedMultilibs.end(), -1) which is more likely to
break at compile time if this occurs.
Alternatively if this is just erasing all but the last element, maybe extract
it, clear the container and reinsert.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143059/new/
https://reviews.llvm.org/D143059
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D143059: [NFC] Enable selecting multiple multilibs
michaelplatings updated this revision to Diff 495558.
michaelplatings added a comment.
Rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143059/new/
https://reviews.llvm.org/D143059
Files:
clang/include/clang/Driver/Multilib.h
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/Driver.cpp
clang/lib/Driver/Multilib.cpp
clang/lib/Driver/ToolChain.cpp
clang/lib/Driver/ToolChains/BareMetal.cpp
clang/lib/Driver/ToolChains/CSKYToolChain.cpp
clang/lib/Driver/ToolChains/Fuchsia.cpp
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Gnu.h
clang/lib/Driver/ToolChains/Hexagon.cpp
clang/lib/Driver/ToolChains/Hurd.cpp
clang/lib/Driver/ToolChains/Linux.cpp
clang/lib/Driver/ToolChains/MipsLinux.cpp
clang/lib/Driver/ToolChains/RISCVToolchain.cpp
clang/test/Driver/fuchsia.cpp
clang/unittests/Driver/MultilibBuilderTest.cpp
clang/unittests/Driver/MultilibTest.cpp
Index: clang/unittests/Driver/MultilibTest.cpp
===
--- clang/unittests/Driver/MultilibTest.cpp
+++ clang/unittests/Driver/MultilibTest.cpp
@@ -153,18 +153,18 @@
Multilib("/bar", {}, {}, {"+bar"}),
});
Multilib::flag_set Flags1 = {"+foo", "-bar"};
- Multilib Selection1;
+ llvm::SmallVector Selection1;
ASSERT_TRUE(MS.select(Flags1, Selection1))
<< "Flag set was {\"+foo\"}, but selection not found";
- ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
- << "Selection picked " << Selection1 << " which was not expected";
+ ASSERT_TRUE(Selection1.back().gccSuffix() == "/foo")
+ << "Selection picked " << Selection1.back() << " which was not expected";
Multilib::flag_set Flags2 = {"+foo", "+bar"};
- Multilib Selection2;
+ llvm::SmallVector Selection2;
ASSERT_TRUE(MS.select(Flags2, Selection2))
<< "Flag set was {\"+bar\"}, but selection not found";
- ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
- << "Selection picked " << Selection2 << " which was not expected";
+ ASSERT_TRUE(Selection2.back().gccSuffix() == "/bar")
+ << "Selection picked " << Selection2.back() << " which was not expected";
}
TEST(MultilibTest, SelectMultiple) {
@@ -172,17 +172,17 @@
Multilib("/a", {}, {}, {"x"}),
Multilib("/b", {}, {}, {"y"}),
});
- std::vector Selection;
+ llvm::SmallVector Selection;
- Selection = MS.select({"x"});
+ ASSERT_TRUE(MS.select({"x"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
- Selection = MS.select({"y"});
+ ASSERT_TRUE(MS.select({"y"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/b", Selection[0].gccSuffix());
- Selection = MS.select({"y", "x"});
+ ASSERT_TRUE(MS.select({"y", "x"}, Selection));
ASSERT_EQ(2u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
EXPECT_EQ("/b", Selection[1].gccSuffix());
@@ -314,7 +314,7 @@
TEST(MultilibTest, SelectSoft) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: s
@@ -333,7 +333,7 @@
TEST(MultilibTest, SelectSoftFP) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: f
@@ -349,7 +349,7 @@
// If hard float is all that's available then select that only if compiling
// with hard float.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: h
@@ -363,7 +363,7 @@
TEST(MultilibTest, SelectFloatABI) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: s
@@ -384,18 +384,18 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/f", Selected.gccSuffix());
+ EXPECT_EQ("/f", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest, SelectFloatABIReversed) {
// If soft is specified after softfp then softfp will never be
// selected because soft is compatible with softfp and last wins.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: h
@@ -416,11 +416,11 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest, SelectMClass)
[PATCH] D143059: [NFC] Enable selecting multiple multilibs
michaelplatings updated this revision to Diff 495464.
michaelplatings added a comment.
Herald added a subscriber: jobnoorman.
Rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143059/new/
https://reviews.llvm.org/D143059
Files:
clang/include/clang/Driver/Multilib.h
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/Driver.cpp
clang/lib/Driver/Multilib.cpp
clang/lib/Driver/ToolChain.cpp
clang/lib/Driver/ToolChains/BareMetal.cpp
clang/lib/Driver/ToolChains/CSKYToolChain.cpp
clang/lib/Driver/ToolChains/Fuchsia.cpp
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Gnu.h
clang/lib/Driver/ToolChains/Hexagon.cpp
clang/lib/Driver/ToolChains/Hurd.cpp
clang/lib/Driver/ToolChains/Linux.cpp
clang/lib/Driver/ToolChains/MipsLinux.cpp
clang/lib/Driver/ToolChains/RISCVToolchain.cpp
clang/test/Driver/fuchsia.cpp
clang/unittests/Driver/MultilibBuilderTest.cpp
clang/unittests/Driver/MultilibTest.cpp
Index: clang/unittests/Driver/MultilibTest.cpp
===
--- clang/unittests/Driver/MultilibTest.cpp
+++ clang/unittests/Driver/MultilibTest.cpp
@@ -153,18 +153,18 @@
Multilib("/bar", {}, {}, {"+bar"}),
});
Multilib::flags_list Flags1 = {"+foo", "-bar"};
- Multilib Selection1;
+ llvm::SmallVector Selection1;
ASSERT_TRUE(MS.select(Flags1, Selection1))
<< "Flag set was {\"+foo\"}, but selection not found";
- ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
- << "Selection picked " << Selection1 << " which was not expected";
+ ASSERT_TRUE(Selection1.back().gccSuffix() == "/foo")
+ << "Selection picked " << Selection1.back() << " which was not expected";
Multilib::flags_list Flags2 = {"+foo", "+bar"};
- Multilib Selection2;
+ llvm::SmallVector Selection2;
ASSERT_TRUE(MS.select(Flags2, Selection2))
<< "Flag set was {\"+bar\"}, but selection not found";
- ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
- << "Selection picked " << Selection2 << " which was not expected";
+ ASSERT_TRUE(Selection2.back().gccSuffix() == "/bar")
+ << "Selection picked " << Selection2.back() << " which was not expected";
}
TEST(MultilibTest, SelectMultiple) {
@@ -172,17 +172,17 @@
Multilib("/a", {}, {}, {"x"}),
Multilib("/b", {}, {}, {"y"}),
});
- std::vector Selection;
+ llvm::SmallVector Selection;
- Selection = MS.select({"x"});
+ ASSERT_TRUE(MS.select({"x"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
- Selection = MS.select({"y"});
+ ASSERT_TRUE(MS.select({"y"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/b", Selection[0].gccSuffix());
- Selection = MS.select({"y", "x"});
+ ASSERT_TRUE(MS.select({"y", "x"}, Selection));
ASSERT_EQ(2u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
EXPECT_EQ("/b", Selection[1].gccSuffix());
@@ -314,7 +314,7 @@
TEST(MultilibTest, SelectSoft) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: s
@@ -333,7 +333,7 @@
TEST(MultilibTest, SelectSoftFP) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: f
@@ -349,7 +349,7 @@
// If hard float is all that's available then select that only if compiling
// with hard float.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: h
@@ -363,7 +363,7 @@
TEST(MultilibTest, SelectFloatABI) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: s
@@ -384,18 +384,18 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/f", Selected.gccSuffix());
+ EXPECT_EQ("/f", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest, SelectFloatABIReversed) {
// If soft is specified after softfp then softfp will never be
// selected because soft is compatible with softfp and last wins.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: h
@@ -416,11 +416,11 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h",
[PATCH] D143059: [NFC] Enable selecting multiple multilibs
michaelplatings updated this revision to Diff 495072.
michaelplatings added a comment.
Rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143059/new/
https://reviews.llvm.org/D143059
Files:
clang/include/clang/Driver/Multilib.h
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/Driver.cpp
clang/lib/Driver/Multilib.cpp
clang/lib/Driver/ToolChain.cpp
clang/lib/Driver/ToolChains/BareMetal.cpp
clang/lib/Driver/ToolChains/CSKYToolChain.cpp
clang/lib/Driver/ToolChains/Fuchsia.cpp
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Gnu.h
clang/lib/Driver/ToolChains/Hexagon.cpp
clang/lib/Driver/ToolChains/Hurd.cpp
clang/lib/Driver/ToolChains/Linux.cpp
clang/lib/Driver/ToolChains/MipsLinux.cpp
clang/lib/Driver/ToolChains/RISCVToolchain.cpp
clang/test/Driver/fuchsia.cpp
clang/unittests/Driver/MultilibBuilderTest.cpp
clang/unittests/Driver/MultilibTest.cpp
Index: clang/unittests/Driver/MultilibTest.cpp
===
--- clang/unittests/Driver/MultilibTest.cpp
+++ clang/unittests/Driver/MultilibTest.cpp
@@ -153,18 +153,18 @@
Multilib("/bar", {}, {}, {"+bar"}),
});
Multilib::flags_list Flags1 = {"+foo", "-bar"};
- Multilib Selection1;
+ llvm::SmallVector Selection1;
ASSERT_TRUE(MS.select(Flags1, Selection1))
<< "Flag set was {\"+foo\"}, but selection not found";
- ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
- << "Selection picked " << Selection1 << " which was not expected";
+ ASSERT_TRUE(Selection1.back().gccSuffix() == "/foo")
+ << "Selection picked " << Selection1.back() << " which was not expected";
Multilib::flags_list Flags2 = {"+foo", "+bar"};
- Multilib Selection2;
+ llvm::SmallVector Selection2;
ASSERT_TRUE(MS.select(Flags2, Selection2))
<< "Flag set was {\"+bar\"}, but selection not found";
- ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
- << "Selection picked " << Selection2 << " which was not expected";
+ ASSERT_TRUE(Selection2.back().gccSuffix() == "/bar")
+ << "Selection picked " << Selection2.back() << " which was not expected";
}
TEST(MultilibTest, SelectMultiple) {
@@ -172,17 +172,17 @@
Multilib("/a", {}, {}, {"x"}),
Multilib("/b", {}, {}, {"y"}),
});
- std::vector Selection;
+ llvm::SmallVector Selection;
- Selection = MS.select({"x"});
+ ASSERT_TRUE(MS.select({"x"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
- Selection = MS.select({"y"});
+ ASSERT_TRUE(MS.select({"y"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/b", Selection[0].gccSuffix());
- Selection = MS.select({"y", "x"});
+ ASSERT_TRUE(MS.select({"y", "x"}, Selection));
ASSERT_EQ(2u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
EXPECT_EQ("/b", Selection[1].gccSuffix());
@@ -314,7 +314,7 @@
TEST(MultilibTest, SelectSoft) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: s
@@ -333,7 +333,7 @@
TEST(MultilibTest, SelectSoftFP) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: f
@@ -349,7 +349,7 @@
// If hard float is all that's available then select that only if compiling
// with hard float.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: h
@@ -363,7 +363,7 @@
TEST(MultilibTest, SelectFloatABI) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: s
@@ -384,18 +384,18 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/f", Selected.gccSuffix());
+ EXPECT_EQ("/f", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest, SelectFloatABIReversed) {
// If soft is specified after softfp then softfp will never be
// selected because soft is compatible with softfp and last wins.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: h
@@ -416,11 +416,11 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest,
[PATCH] D143059: [NFC] Enable selecting multiple multilibs
michaelplatings updated this revision to Diff 494416.
michaelplatings added a comment.
Rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143059/new/
https://reviews.llvm.org/D143059
Files:
clang/include/clang/Driver/Multilib.h
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/Driver.cpp
clang/lib/Driver/Multilib.cpp
clang/lib/Driver/ToolChain.cpp
clang/lib/Driver/ToolChains/BareMetal.cpp
clang/lib/Driver/ToolChains/CSKYToolChain.cpp
clang/lib/Driver/ToolChains/Fuchsia.cpp
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Gnu.h
clang/lib/Driver/ToolChains/Hexagon.cpp
clang/lib/Driver/ToolChains/Hurd.cpp
clang/lib/Driver/ToolChains/Linux.cpp
clang/lib/Driver/ToolChains/MipsLinux.cpp
clang/lib/Driver/ToolChains/RISCVToolchain.cpp
clang/test/Driver/fuchsia.cpp
clang/unittests/Driver/FuchsiaTest.cpp
clang/unittests/Driver/MultilibBuilderTest.cpp
clang/unittests/Driver/MultilibTest.cpp
Index: clang/unittests/Driver/MultilibTest.cpp
===
--- clang/unittests/Driver/MultilibTest.cpp
+++ clang/unittests/Driver/MultilibTest.cpp
@@ -153,18 +153,18 @@
Multilib("/bar", {}, {}, {"+bar"}),
});
Multilib::flags_list Flags1 = {"+foo", "-bar"};
- Multilib Selection1;
+ llvm::SmallVector Selection1;
ASSERT_TRUE(MS.select(Flags1, Selection1))
<< "Flag set was {\"+foo\"}, but selection not found";
- ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
- << "Selection picked " << Selection1 << " which was not expected";
+ ASSERT_TRUE(Selection1.back().gccSuffix() == "/foo")
+ << "Selection picked " << Selection1.back() << " which was not expected";
Multilib::flags_list Flags2 = {"+foo", "+bar"};
- Multilib Selection2;
+ llvm::SmallVector Selection2;
ASSERT_TRUE(MS.select(Flags2, Selection2))
<< "Flag set was {\"+bar\"}, but selection not found";
- ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
- << "Selection picked " << Selection2 << " which was not expected";
+ ASSERT_TRUE(Selection2.back().gccSuffix() == "/bar")
+ << "Selection picked " << Selection2.back() << " which was not expected";
}
TEST(MultilibTest, SelectMultiple) {
@@ -172,17 +172,17 @@
Multilib("/a", {}, {}, {"x"}),
Multilib("/b", {}, {}, {"y"}),
});
- std::vector Selection;
+ llvm::SmallVector Selection;
- Selection = MS.select({"x"});
+ ASSERT_TRUE(MS.select({"x"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
- Selection = MS.select({"y"});
+ ASSERT_TRUE(MS.select({"y"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/b", Selection[0].gccSuffix());
- Selection = MS.select({"y", "x"});
+ ASSERT_TRUE(MS.select({"y", "x"}, Selection));
ASSERT_EQ(2u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
EXPECT_EQ("/b", Selection[1].gccSuffix());
@@ -314,7 +314,7 @@
TEST(MultilibTest, SelectSoft) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: s
@@ -333,7 +333,7 @@
TEST(MultilibTest, SelectSoftFP) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: f
@@ -349,7 +349,7 @@
// If hard float is all that's available then select that only if compiling
// with hard float.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: h
@@ -363,7 +363,7 @@
TEST(MultilibTest, SelectFloatABI) {
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: s
@@ -384,18 +384,18 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/f", Selected.gccSuffix());
+ EXPECT_EQ("/f", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest, SelectFloatABIReversed) {
// If soft is specified after softfp then softfp will never be
// selected because soft is compatible with softfp and last wins.
MultilibSet MS;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, R"(
variants:
- dir: h
@@ -416,11 +416,11 @@
noMatchFlags: [hasfp]
)"));
MS.select({"mfloat-abi=soft"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=softfp"}, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
MS.select({"mfloat-abi=hard"}, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h",
[PATCH] D143059: [NFC] Enable selecting multiple multilibs
michaelplatings updated this revision to Diff 494262.
michaelplatings added a comment.
Rebase and change llvm::SmallVector to simply
llvm::SmallVector
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143059/new/
https://reviews.llvm.org/D143059
Files:
clang/include/clang/Driver/Multilib.h
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/Driver.cpp
clang/lib/Driver/Multilib.cpp
clang/lib/Driver/ToolChain.cpp
clang/lib/Driver/ToolChains/BareMetal.cpp
clang/lib/Driver/ToolChains/CSKYToolChain.cpp
clang/lib/Driver/ToolChains/Fuchsia.cpp
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Gnu.h
clang/lib/Driver/ToolChains/Hexagon.cpp
clang/lib/Driver/ToolChains/Hurd.cpp
clang/lib/Driver/ToolChains/Linux.cpp
clang/lib/Driver/ToolChains/MipsLinux.cpp
clang/lib/Driver/ToolChains/RISCVToolchain.cpp
clang/test/Driver/fuchsia.cpp
clang/unittests/Driver/FuchsiaTest.cpp
clang/unittests/Driver/MultilibBuilderTest.cpp
clang/unittests/Driver/MultilibTest.cpp
Index: clang/unittests/Driver/MultilibTest.cpp
===
--- clang/unittests/Driver/MultilibTest.cpp
+++ clang/unittests/Driver/MultilibTest.cpp
@@ -153,18 +153,18 @@
Multilib("/bar", {}, {}, {"+bar"}),
});
Multilib::flags_list Flags1 = {"+foo", "-bar"};
- Multilib Selection1;
+ llvm::SmallVector Selection1;
ASSERT_TRUE(MS.select(Flags1, Selection1))
<< "Flag set was {\"+foo\"}, but selection not found";
- ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
- << "Selection picked " << Selection1 << " which was not expected";
+ ASSERT_TRUE(Selection1.back().gccSuffix() == "/foo")
+ << "Selection picked " << Selection1.back() << " which was not expected";
Multilib::flags_list Flags2 = {"+foo", "+bar"};
- Multilib Selection2;
+ llvm::SmallVector Selection2;
ASSERT_TRUE(MS.select(Flags2, Selection2))
<< "Flag set was {\"+bar\"}, but selection not found";
- ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
- << "Selection picked " << Selection2 << " which was not expected";
+ ASSERT_TRUE(Selection2.back().gccSuffix() == "/bar")
+ << "Selection picked " << Selection2.back() << " which was not expected";
}
TEST(MultilibTest, SelectMultiple) {
@@ -172,17 +172,17 @@
Multilib("/a", {}, {}, {"x"}),
Multilib("/b", {}, {}, {"y"}),
});
- std::vector Selection;
+ llvm::SmallVector Selection;
- Selection = MS.select({"x"});
+ ASSERT_TRUE(MS.select({"x"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
- Selection = MS.select({"y"});
+ ASSERT_TRUE(MS.select({"y"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/b", Selection[0].gccSuffix());
- Selection = MS.select({"y", "x"});
+ ASSERT_TRUE(MS.select({"y", "x"}, Selection));
ASSERT_EQ(2u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
EXPECT_EQ("/b", Selection[1].gccSuffix());
@@ -317,7 +317,7 @@
static bool select(const std::vector ,
const MultilibSet , const MultilibFlagMap ,
- Multilib ) {
+ llvm::SmallVector ) {
Multilib::flags_list Flags(MFM.getFlags(InFlags));
Flags.insert(InFlags.begin(), InFlags.end());
return MS.select(Flags, Selected);
@@ -326,7 +326,7 @@
TEST(MultilibTest, SelectSoft) {
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: s
@@ -346,7 +346,7 @@
TEST(MultilibTest, SelectSoftFP) {
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: f
@@ -363,7 +363,7 @@
// with hard float.
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: h
@@ -378,7 +378,7 @@
TEST(MultilibTest, SelectFloatABI) {
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: s
@@ -399,11 +399,11 @@
noMatchFlags: [hasfp]
)"));
select({"mfloat-abi=soft"}, MS, MFM, Selected);
- EXPECT_EQ("/s", Selected.gccSuffix());
+ EXPECT_EQ("/s", Selected.back().gccSuffix());
select({"mfloat-abi=softfp"}, MS, MFM, Selected);
- EXPECT_EQ("/f", Selected.gccSuffix());
+ EXPECT_EQ("/f", Selected.back().gccSuffix());
select({"mfloat-abi=hard"}, MS, MFM, Selected);
- EXPECT_EQ("/h", Selected.gccSuffix());
+ EXPECT_EQ("/h", Selected.back().gccSuffix());
}
TEST(MultilibTest, SelectFloatABIReversed) {
@@ -411,7 +411,7 @@
// selected because soft is compatible with softfp and last wins.
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: h
@@ -432,11 +432,11 @@
[PATCH] D143059: [NFC] Enable selecting multiple multilibs
michaelplatings created this revision.
michaelplatings added a reviewer: phosek.
Herald added subscribers: luke, abrachet, frasercrmck, luismarques, apazos,
sameer.abuasal, s.egerton, Jim, jocewei, PkmX, the_o, brucehoult,
MartinMosbeck, rogfer01, atanasyan, edward-jones, zzheng, jrtc27, niosHD,
sabuasal, simoncook, johnrusso, rbar, asb, sdardis.
Herald added a project: All.
michaelplatings requested review of this revision.
Herald added subscribers: cfe-commits, pcwang-thead, MaskRay.
Herald added a project: clang.
This will enable layering multilibs on top of each other.
For example a multilib containing only a no-exceptions libc++ could be
layered on top of a multilib containing C libs. This avoids the need
to duplicate the C library for every libc++ variant.
This change doesn't expose the functionality externally, it only opens
the functionality up to be potentially used by ToolChain classes.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D143059
Files:
clang/include/clang/Driver/Multilib.h
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/Driver.cpp
clang/lib/Driver/Multilib.cpp
clang/lib/Driver/ToolChain.cpp
clang/lib/Driver/ToolChains/BareMetal.cpp
clang/lib/Driver/ToolChains/CSKYToolChain.cpp
clang/lib/Driver/ToolChains/Fuchsia.cpp
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Gnu.h
clang/lib/Driver/ToolChains/Hexagon.cpp
clang/lib/Driver/ToolChains/Hurd.cpp
clang/lib/Driver/ToolChains/Linux.cpp
clang/lib/Driver/ToolChains/MipsLinux.cpp
clang/lib/Driver/ToolChains/RISCVToolchain.cpp
clang/test/Driver/fuchsia.cpp
clang/unittests/Driver/FuchsiaTest.cpp
clang/unittests/Driver/MultilibBuilderTest.cpp
clang/unittests/Driver/MultilibTest.cpp
Index: clang/unittests/Driver/MultilibTest.cpp
===
--- clang/unittests/Driver/MultilibTest.cpp
+++ clang/unittests/Driver/MultilibTest.cpp
@@ -153,18 +153,18 @@
Multilib("/bar", {}, {}, {"+bar"}),
});
Multilib::flags_list Flags1 = {"+foo", "-bar"};
- Multilib Selection1;
+ llvm::SmallVector Selection1;
ASSERT_TRUE(MS.select(Flags1, Selection1))
<< "Flag set was {\"+foo\"}, but selection not found";
- ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
- << "Selection picked " << Selection1 << " which was not expected";
+ ASSERT_TRUE(Selection1.back().gccSuffix() == "/foo")
+ << "Selection picked " << Selection1.back() << " which was not expected";
Multilib::flags_list Flags2 = {"+foo", "+bar"};
- Multilib Selection2;
+ llvm::SmallVector Selection2;
ASSERT_TRUE(MS.select(Flags2, Selection2))
<< "Flag set was {\"+bar\"}, but selection not found";
- ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
- << "Selection picked " << Selection2 << " which was not expected";
+ ASSERT_TRUE(Selection2.back().gccSuffix() == "/bar")
+ << "Selection picked " << Selection2.back() << " which was not expected";
}
TEST(MultilibTest, SelectMultiple) {
@@ -172,17 +172,17 @@
Multilib("/a", {}, {}, {"x"}),
Multilib("/b", {}, {}, {"y"}),
});
- std::vector Selection;
+ llvm::SmallVector Selection;
- Selection = MS.select({"x"});
+ ASSERT_TRUE(MS.select({"x"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
- Selection = MS.select({"y"});
+ ASSERT_TRUE(MS.select({"y"}, Selection));
ASSERT_EQ(1u, Selection.size());
EXPECT_EQ("/b", Selection[0].gccSuffix());
- Selection = MS.select({"y", "x"});
+ ASSERT_TRUE(MS.select({"y", "x"}, Selection));
ASSERT_EQ(2u, Selection.size());
EXPECT_EQ("/a", Selection[0].gccSuffix());
EXPECT_EQ("/b", Selection[1].gccSuffix());
@@ -307,7 +307,7 @@
static bool select(const std::vector ,
const MultilibSet , const MultilibFlagMap ,
- Multilib ) {
+ llvm::SmallVector ) {
Multilib::flags_list Flags(MFM.getFlags(InFlags));
Flags.insert(InFlags.begin(), InFlags.end());
return MS.select(Flags, Selected);
@@ -316,7 +316,7 @@
TEST(MultilibTest, SelectSoft) {
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: s
@@ -336,7 +336,7 @@
TEST(MultilibTest, SelectSoftFP) {
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: f
@@ -353,7 +353,7 @@
// with hard float.
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: h
@@ -368,7 +368,7 @@
TEST(MultilibTest, SelectFloatABI) {
MultilibSet MS;
MultilibFlagMap MFM;
- Multilib Selected;
+ llvm::SmallVector Selected;
ASSERT_TRUE(parse(MS, MFM, R"(
variants:
- dir: s
@@ -389,11 +389,11 @@
noMatchFlags: [hasfp]
)"));
select({"mfloat-abi=soft"}, MS, MFM, Selected);
