[llvm] beb92af - Revert "[Support] Reset option to its default if its Default field is undefined"
Yevgeny Rouban via llvm-commits
llvm-commits at lists.llvm.org
Sun Feb 27 06:48:01 PST 2022
Author: Yevgeny Rouban
Date: 2022-02-27T21:46:10+07:00
New Revision: beb92af01b0b193f8cb06647f7a4fd23ec15d896
URL: https://github.com/llvm/llvm-project/commit/beb92af01b0b193f8cb06647f7a4fd23ec15d896
DIFF: https://github.com/llvm/llvm-project/commit/beb92af01b0b193f8cb06647f7a4fd23ec15d896.diff
LOG: Revert "[Support] Reset option to its default if its Default field is undefined"
This reverts commit 7fb39fb6d6665cd469557b43eb205cc32b0a7ac3 as clang buildbots failed.
Added:
Modified:
llvm/include/llvm/Support/CommandLine.h
llvm/unittests/Support/CommandLineTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Support/CommandLine.h b/llvm/include/llvm/Support/CommandLine.h
index 3dbc21b2d8c49..29e2dca04c900 100644
--- a/llvm/include/llvm/Support/CommandLine.h
+++ b/llvm/include/llvm/Support/CommandLine.h
@@ -1436,8 +1436,6 @@ class opt : public Option,
const OptionValue<DataType> &V = this->getDefault();
if (V.hasValue())
this->setValue(V.getValue());
- else
- this->setValue(T());
}
template <class T,
diff --git a/llvm/unittests/Support/CommandLineTest.cpp b/llvm/unittests/Support/CommandLineTest.cpp
index c683f912779ac..9a7f4f38740f1 100644
--- a/llvm/unittests/Support/CommandLineTest.cpp
+++ b/llvm/unittests/Support/CommandLineTest.cpp
@@ -1934,9 +1934,8 @@ TEST(CommandLineTest, ConsumeAfterTwoPositionals) {
TEST(CommandLineTest, ResetAllOptionOccurrences) {
cl::ResetCommandLineParser();
- // -option -str -enableA -enableC [sink] input [args]
+ // -option -enableA -enableC [sink] input [args]
StackOption<bool> Option("option");
- StackOption<std::string> Str("str");
enum Vals { ValA, ValB, ValC };
StackOption<Vals, cl::bits<Vals>> Bits(
cl::values(clEnumValN(ValA, "enableA", "Enable A"),
@@ -1946,16 +1945,15 @@ TEST(CommandLineTest, ResetAllOptionOccurrences) {
StackOption<std::string> Input(cl::Positional);
StackOption<std::string, cl::list<std::string>> ExtraArgs(cl::ConsumeAfter);
- const char *Args[] = {"prog", "-option", "-str=STR", "-enableA",
- "-enableC", "-unknown", "input", "-arg"};
+ const char *Args[] = {"prog", "-option", "-enableA", "-enableC",
+ "-unknown", "input", "-arg"};
std::string Errs;
raw_string_ostream OS(Errs);
- EXPECT_TRUE(cl::ParseCommandLineOptions(8, Args, StringRef(), &OS));
+ EXPECT_TRUE(cl::ParseCommandLineOptions(7, Args, StringRef(), &OS));
EXPECT_TRUE(OS.str().empty());
EXPECT_TRUE(Option);
- EXPECT_EQ("STR", Str);
EXPECT_EQ((1u << ValA) | (1u << ValC), Bits.getBits());
EXPECT_EQ(1u, Sink.size());
EXPECT_EQ("-unknown", Sink[0]);
@@ -1965,7 +1963,6 @@ TEST(CommandLineTest, ResetAllOptionOccurrences) {
cl::ResetAllOptionOccurrences();
EXPECT_FALSE(Option);
- EXPECT_EQ("", Str);
EXPECT_EQ(0u, Bits.getBits());
EXPECT_EQ(0u, Sink.size());
EXPECT_EQ(0, Input.getNumOccurrences());
More information about the llvm-commits
mailing list