Skip to content

[NFC][TableGen] Change CodeGenIntrinsics to use const references #111219

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.

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 1 commit into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void CodeGenIntrinsicTable::CheckTargetIndependentIntrinsics() const {
}
}

CodeGenIntrinsic &CodeGenIntrinsicMap::operator[](const Record *Record) {
const CodeGenIntrinsic &CodeGenIntrinsicMap::operator[](const Record *Record) {
if (!Record->isSubClassOf("Intrinsic"))
PrintFatalError("Intrinsic defs should be subclass of 'Intrinsic' class");

Expand Down
10 changes: 5 additions & 5 deletions llvm/utils/TableGen/Basic/CodeGenIntrinsics.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,30 +169,30 @@ struct CodeGenIntrinsic {
};

class CodeGenIntrinsicTable {
std::vector<CodeGenIntrinsic> Intrinsics;

public:
struct TargetSet {
StringRef Name;
size_t Offset;
size_t Count;
};
std::vector<TargetSet> Targets;

explicit CodeGenIntrinsicTable(const RecordKeeper &RC);

bool empty() const { return Intrinsics.empty(); }
size_t size() const { return Intrinsics.size(); }
auto begin() const { return Intrinsics.begin(); }
auto end() const { return Intrinsics.end(); }
CodeGenIntrinsic &operator[](size_t Pos) { return Intrinsics[Pos]; }
const CodeGenIntrinsic &operator[](size_t Pos) const {
return Intrinsics[Pos];
}
ArrayRef<TargetSet> getTargets() const { return Targets; }

private:
void CheckDuplicateIntrinsics() const;
void CheckTargetIndependentIntrinsics() const;

std::vector<CodeGenIntrinsic> Intrinsics;
std::vector<TargetSet> Targets;
};

// This class builds `CodeGenIntrinsic` on demand for a given Def.
Expand All @@ -202,7 +202,7 @@ class CodeGenIntrinsicMap {

public:
explicit CodeGenIntrinsicMap(const RecordKeeper &RC) : Ctx(RC) {}
CodeGenIntrinsic &operator[](const Record *Def);
const CodeGenIntrinsic &operator[](const Record *Def);
};

} // namespace llvm
Expand Down
6 changes: 3 additions & 3 deletions llvm/utils/TableGen/IntrinsicEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ void IntrinsicEmitter::EmitEnumInfo(const CodeGenIntrinsicTable &Ints,
// intrinsics like dbg.value.
using TargetSet = CodeGenIntrinsicTable::TargetSet;
const TargetSet *Set = nullptr;
for (const auto &Target : Ints.Targets) {
for (const auto &Target : Ints.getTargets()) {
if (Target.Name == IntrinsicPrefix) {
Set = &Target;
break;
}
}
if (!Set) {
// The first entry is for target independent intrinsics, so drop it.
auto KnowTargets = ArrayRef<TargetSet>(Ints.Targets).drop_front();
auto KnowTargets = Ints.getTargets().drop_front();
PrintFatalError([KnowTargets](raw_ostream &OS) {
OS << "tried to generate intrinsics for unknown target "
<< IntrinsicPrefix << "\nKnown targets are: ";
Expand Down Expand Up @@ -230,7 +230,7 @@ struct IntrinsicTargetInfo {
};
static constexpr IntrinsicTargetInfo TargetInfos[] = {
)";
for (const auto [Name, Offset, Count] : Ints.Targets)
for (const auto [Name, Offset, Count] : Ints.getTargets())
OS << formatv(" {{\"{}\", {}, {}},\n", Name, Offset, Count);
OS << R"(};
#endif
Expand Down
Loading