Skip to content

Commit d95e624

Browse files
author
tim-pugh
committed
Revert "generic commit"
This reverts commit 6900a62.
1 parent 32fae72 commit d95e624

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

clang/include/clang/AST/RecordFieldReorganizer.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,7 @@ class RecordFieldReorganizer {
3737
};
3838

3939
class Randstruct : public RecordFieldReorganizer {
40-
public:
41-
Randstruct(std::string seed) : Seq(seed.begin(), seed.end()), rng(Seq) {}
42-
private:
43-
std::seed_seq Seq;
44-
std::default_random_engine rng;
4540
protected:
46-
virtual SmallVector<FieldDecl *, 64> randomize() override;
47-
SmallVector<Decl *, 64> Randstruct::perfrandomize(const ASTContext &ctx,
48-
SmallVector<Decl *, 64> fields);
4941
virtual void reorganize(const ASTContext &C, const RecordDecl *D,
5042
SmallVector<Decl *, 64> &NewOrder) const override;
5143
};

clang/lib/AST/RecordFieldReorganizer.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,14 @@ bool BitfieldRun::canFit(size_t size) const {
144144

145145
bool BitfieldRun::isBitfieldRun() const { return true; }
146146

147-
SmallVector<Decl *, 64> Randstruct::randomize(SmallVector<Decl *, 64> fields) {
147+
SmallVector<Decl *, 64> randomize(SmallVector<Decl *, 64> fields) {
148148
std::seed_seq Seq(RandstructSeed.begin(), RandstructSeed.end());
149149
auto rng = std::default_random_engine{Seq};
150150
std::shuffle(std::begin(fields), std::end(fields), rng);
151151
return fields;
152152
}
153153

154-
Randstruct::Randstruct(std::String Seed) { RandstructSeed = Seed; }
155-
156-
SmallVector<Decl *, 64> Randstruct::perfrandomize(const ASTContext &ctx,
154+
SmallVector<Decl *, 64> perfrandomize(const ASTContext &ctx,
157155
SmallVector<Decl *, 64> fields) {
158156
// All of the buckets produced by best-effort cache-line algorithm.
159157
std::vector<std::unique_ptr<Bucket>> buckets;

0 commit comments

Comments
 (0)