Skip to content

[NFC][TableGen] Use private inheritance for TrailingObjects #138027

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.

Sign up for GitHub

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
May 2, 2025
Merged

[NFC][TableGen] Use private inheritance for TrailingObjects #138027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 32 additions & 49 deletions llvm/include/llvm/TableGen/Record.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,14 @@ class DagRecTy : public RecTy {
/// are not the superclass of some other listed class.
class RecordRecTy final : public RecTy,
public FoldingSetNode,
public TrailingObjects<RecordRecTy, const Record *> {
private TrailingObjects<RecordRecTy, const Record *> {
friend TrailingObjects;
friend class Record;
friend detail::RecordKeeperImpl;

unsigned NumClasses;

explicit RecordRecTy(RecordKeeper &RK, unsigned Num)
: RecTy(RecordRecTyKind, RK), NumClasses(Num) {}
explicit RecordRecTy(RecordKeeper &RK, ArrayRef<const Record *> Classes);

public:
RecordRecTy(const RecordRecTy &) = delete;
Expand Down Expand Up @@ -587,11 +587,11 @@ class BitInit final : public TypedInit {
/// It contains a vector of bits, whose size is determined by the type.
class BitsInit final : public TypedInit,
public FoldingSetNode,
public TrailingObjects<BitsInit, const Init *> {
private TrailingObjects<BitsInit, const Init *> {
friend TrailingObjects;
unsigned NumBits;

BitsInit(RecordKeeper &RK, unsigned N)
: TypedInit(IK_BitsInit, BitsRecTy::get(RK, N)), NumBits(N) {}
BitsInit(RecordKeeper &RK, ArrayRef<const Init *> Bits);

public:
BitsInit(const BitsInit &) = delete;
Expand Down Expand Up @@ -757,15 +757,15 @@ class StringInit final : public TypedInit {
///
class ListInit final : public TypedInit,
public FoldingSetNode,
public TrailingObjects<ListInit, const Init *> {
private TrailingObjects<ListInit, const Init *> {
friend TrailingObjects;
unsigned NumValues;

public:
using const_iterator = const Init *const *;

private:
explicit ListInit(unsigned N, const RecTy *EltTy)
: TypedInit(IK_ListInit, ListRecTy::get(EltTy)), NumValues(N) {}
explicit ListInit(ArrayRef<const Init *> Elements, const RecTy *EltTy);

public:
ListInit(const ListInit &) = delete;
Expand Down Expand Up @@ -1019,12 +1019,13 @@ class TernOpInit final : public OpInit, public FoldingSetNode {
/// Otherwise reports an error.
class CondOpInit final : public TypedInit,
public FoldingSetNode,
public TrailingObjects<CondOpInit, const Init *> {
private TrailingObjects<CondOpInit, const Init *> {
friend TrailingObjects;
unsigned NumConds;
const RecTy *ValType;

CondOpInit(unsigned NC, const RecTy *Type)
: TypedInit(IK_CondOpInit, Type), NumConds(NC), ValType(Type) {}
CondOpInit(ArrayRef<const Init *> Conds, ArrayRef<const Init *> Values,
const RecTy *Type);

size_t numTrailingObjects(OverloadToken<Init *>) const {
return 2*NumConds;
Expand All @@ -1038,24 +1039,19 @@ class CondOpInit final : public TypedInit,
return I->getKind() == IK_CondOpInit;
}

static const CondOpInit *get(ArrayRef<const Init *> C,
ArrayRef<const Init *> V, const RecTy *Type);
static const CondOpInit *get(ArrayRef<const Init *> Conds,
ArrayRef<const Init *> Values,
const RecTy *Type);

void Profile(FoldingSetNodeID &ID) const;

const RecTy *getValType() const { return ValType; }

unsigned getNumConds() const { return NumConds; }

const Init *getCond(unsigned Num) const {
assert(Num < NumConds && "Condition number out of range!");
return getTrailingObjects<const Init *>()[Num];
}
const Init *getCond(unsigned Num) const { return getConds()[Num]; }

const Init *getVal(unsigned Num) const {
assert(Num < NumConds && "Val number out of range!");
return getTrailingObjects<const Init *>()[Num + NumConds];
}
const Init *getVal(unsigned Num) const { return getVals()[Num]; }

ArrayRef<const Init *> getConds() const {
return ArrayRef(getTrailingObjects<const Init *>(), NumConds);
Expand Down Expand Up @@ -1337,13 +1333,15 @@ class DefInit final : public TypedInit {
class VarDefInit final
: public TypedInit,
public FoldingSetNode,
public TrailingObjects<VarDefInit, const ArgumentInit *> {
private TrailingObjects<VarDefInit, const ArgumentInit *> {
friend TrailingObjects;
SMLoc Loc;
const Record *Class;
const DefInit *Def = nullptr; // after instantiation
unsigned NumArgs;

explicit VarDefInit(SMLoc Loc, const Record *Class, unsigned N);
explicit VarDefInit(SMLoc Loc, const Record *Class,
ArrayRef<const ArgumentInit *> Args);

const DefInit *instantiate();

Expand All @@ -1367,23 +1365,18 @@ class VarDefInit final

std::string getAsString() const override;

const ArgumentInit *getArg(unsigned i) const {
assert(i < NumArgs && "Argument index out of range!");
return getTrailingObjects<const ArgumentInit *>()[i];
}
const ArgumentInit *getArg(unsigned i) const { return args()[i]; }

using const_iterator = const ArgumentInit *const *;

const_iterator args_begin() const {
return getTrailingObjects<const ArgumentInit *>();
}
const_iterator args_end () const { return args_begin() + NumArgs; }
const_iterator args_begin() const { return args().begin(); }
const_iterator args_end() const { return args().end(); }

size_t args_size () const { return NumArgs; }
bool args_empty() const { return NumArgs == 0; }

ArrayRef<const ArgumentInit *> args() const {
return ArrayRef(args_begin(), NumArgs);
return ArrayRef(getTrailingObjects<const ArgumentInit *>(), NumArgs);
}

const Init *getBit(unsigned Bit) const override {
Expand Down Expand Up @@ -1438,18 +1431,15 @@ class FieldInit final : public TypedInit {
class DagInit final
: public TypedInit,
public FoldingSetNode,
public TrailingObjects<DagInit, const Init *, const StringInit *> {
private TrailingObjects<DagInit, const Init *, const StringInit *> {
friend TrailingObjects;

const Init *Val;
const StringInit *ValName;
unsigned NumArgs;
unsigned NumArgNames;

DagInit(const Init *V, const StringInit *VN, unsigned NumArgs,
unsigned NumArgNames)
: TypedInit(IK_DagInit, DagRecTy::get(V->getRecordKeeper())), Val(V),
ValName(VN), NumArgs(NumArgs), NumArgNames(NumArgNames) {}
DagInit(const Init *V, const StringInit *VN, ArrayRef<const Init *> Args,
ArrayRef<const StringInit *> ArgNames);

size_t numTrailingObjects(OverloadToken<const Init *>) const {
return NumArgs;
Expand Down Expand Up @@ -1483,18 +1473,14 @@ class DagInit final

unsigned getNumArgs() const { return NumArgs; }

const Init *getArg(unsigned Num) const {
assert(Num < NumArgs && "Arg number out of range!");
return getTrailingObjects<const Init *>()[Num];
}
const Init *getArg(unsigned Num) const { return getArgs()[Num]; }

/// This method looks up the specified argument name and returns its argument
/// number or std::nullopt if that argument name does not exist.
std::optional<unsigned> getArgNo(StringRef Name) const;

const StringInit *getArgName(unsigned Num) const {
assert(Num < NumArgNames && "Arg number out of range!");
return getTrailingObjects<const StringInit *>()[Num];
return getArgNames()[Num];
}

StringRef getArgNameStr(unsigned Num) const {
Expand All @@ -1507,7 +1493,7 @@ class DagInit final
}

ArrayRef<const StringInit *> getArgNames() const {
return ArrayRef(getTrailingObjects<const StringInit *>(), NumArgNames);
return ArrayRef(getTrailingObjects<const StringInit *>(), NumArgs);
}

const Init *resolveReferences(Resolver &R) const override;
Expand All @@ -1528,9 +1514,6 @@ class DagInit final
inline const_name_iterator name_begin() const { return getArgNames().begin();}
inline const_name_iterator name_end () const { return getArgNames().end(); }

inline size_t name_size () const { return NumArgNames; }
inline bool name_empty() const { return NumArgNames == 0; }

const Init *getBit(unsigned Bit) const override {
llvm_unreachable("Illegal bit reference off dag");
}
Expand Down
Loading