This is an archive of the discontinued LLVM Phabricator instance.

Differential D81021

[TableGen] Avoid generating switch with just default
ClosedPublic

Authored by dstuttard on Jun 2 2020, 11:17 AM.

Details

Reviewers
dsanders
Commits
rG9244be7b0514: [TableGen] Avoid generating switch with just default
Summary

Switch with just default causes an MSVC warning (warning C4065: switch statement
contains 'default' but no 'case' labels).

Change-Id: I9ddeccdef93666256b5454b164b567b73b488461

Diff Detail

Event Timeline

dstuttard created this revision.Jun 2 2020, 11:17 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 2 2020, 11:17 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
dstuttard added a reviewer: dsanders.Jun 2 2020, 11:20 AM
dsanders accepted this revision.Jun 2 2020, 11:34 AM

LGTM

This revision is now accepted and ready to land.Jun 2 2020, 11:34 AM
Closed by commit rG9244be7b0514: [TableGen] Avoid generating switch with just default (authored by dstuttard). · Explain WhyJun 2 2020, 12:05 PM
This revision was automatically updated to reflect the committed changes.
Harbormaster completed remote builds in B58792: Diff 267942.Jun 2 2020, 1:10 PM

Revision Contents

PathSize
llvm/
utils/
TableGen/
GlobalISel/
28 lines

Diff 267949

llvm/utils/TableGen/GlobalISel/GIMatchTree.cpp

Show First 20 Lines • Show All 606 Lines • ▼ Show 20 Lines for (unsigned I : Partitions.find(Partition.second)->second.set_bits()) {
Separator = ", "; Separator = ", ";
} }
OS << "\n"; OS << "\n";
} }
} }
void GIMatchTreeOpcodePartitioner::generatePartitionSelectorCode( void GIMatchTreeOpcodePartitioner::generatePartitionSelectorCode(
raw_ostream &OS, StringRef Indent) const { raw_ostream &OS, StringRef Indent) const {
// Make sure not to emit empty switch or switch with just default
if (PartitionToInstr.size() == 1 && PartitionToInstr[0] == nullptr) {
OS << Indent << "Partition = 0;\n";
} else if (PartitionToInstr.size()) {
OS << Indent << "Partition = -1;\n" OS << Indent << "Partition = -1;\n"
<< Indent << "switch (MIs[" << InstrID << "]->getOpcode()) {\n"; << Indent << "switch (MIs[" << InstrID << "]->getOpcode()) {\n";
for (const auto &EnumInstr : enumerate(PartitionToInstr)) { for (const auto &EnumInstr : enumerate(PartitionToInstr)) {
if (EnumInstr.value() == nullptr) if (EnumInstr.value() == nullptr)
OS << Indent << "default:"; OS << Indent << "default:";
else else
OS << Indent << "case " << EnumInstr.value()->Namespace OS << Indent << "case " << EnumInstr.value()->Namespace
<< "::" << EnumInstr.value()->TheDef->getName() << ":"; << "::" << EnumInstr.value()->TheDef->getName() << ":";
OS << " Partition = " << EnumInstr.index() << "; break;\n"; OS << " Partition = " << EnumInstr.index() << "; break;\n";
} }
OS << Indent << "}\n" OS << Indent << "}\n";
<< Indent }
OS << Indent
<< "// Default case but without conflicting with potential default case " << "// Default case but without conflicting with potential default case "
"in selection.\n" "in selection.\n"
<< Indent << "if (Partition == -1) return false;\n"; << Indent << "if (Partition == -1) return false;\n";
} }
void GIMatchTreeVRegDefPartitioner::addToPartition(bool Result, void GIMatchTreeVRegDefPartitioner::addToPartition(bool Result,
unsigned LeafIdx) { unsigned LeafIdx) {
auto I = ResultToPartition.find(Result); auto I = ResultToPartition.find(Result);
▲ Show 20 Lines • Show All 135 Lines • ▼ Show 20 Linesvoid GIMatchTreeVRegDefPartitioner::generatePartitionSelectorCode(
for (const auto &Pair : ResultToPartition) for (const auto &Pair : ResultToPartition)
OS << Indent << "if (MIs[" << NewInstrID << "] " OS << Indent << "if (MIs[" << NewInstrID << "] "
<< (Pair.first ? "==" : "!=") << (Pair.first ? "==" : "!=")
<< " nullptr) Partition = " << Pair.second << ";\n"; << " nullptr) Partition = " << Pair.second << ";\n";
OS << Indent << "if (Partition == -1) return false;\n"; OS << Indent << "if (Partition == -1) return false;\n";
} }