Minor simplifications.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@92390 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvmc/plugins/Base/Base.td.in b/tools/llvmc/plugins/Base/Base.td.in
index 1413593..7262372 100644
--- a/tools/llvmc/plugins/Base/Base.td.in
+++ b/tools/llvmc/plugins/Base/Base.td.in
@@ -97,11 +97,10 @@
(unset_option ["O0", "O1", "O2"]),
(and (switch_on "O2"), (any_switch_on ["O0", "O1"])),
(unset_option ["O0", "O1"]),
- (and (switch_on "O1"), (switch_on "O0")),
+ (switch_on ["O1", "O0"]),
(unset_option "O0"))
>;
-
// Tools
class llvm_gcc_based <string cmd_prefix, string in_lang, string E_ext> : Tool<
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index 1c7e5d0..42cedf2 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -1240,7 +1240,7 @@
const DagInit& d,
const OptionDescriptions& OptDescs,
raw_ostream& O) {
- const ListInit& L = *static_cast<ListInit*>(d.getArg(0));
+ const ListInit& L = InitPtrToList(d.getArg(0));
if (TestName == "any_switch_on") {
EmitListTest(L, "||", EmitSwitchOn(OptDescs), O);