generic commit

Author: Jordan Cantrell

clang/include/clang/AST/RecordFieldReorganizer.h

@@ -37,7 +37,15 @@ class RecordFieldReorganizer {
 };
 
 class Randstruct : public RecordFieldReorganizer {
+public:
+ Randstruct(std::string seed) : Seq(seed.begin(), seed.end()), rng(Seq) {}
+private:
+ std::seed_seq Seq;
+ std::default_random_engine rng;
 protected:
+ virtual SmallVector<FieldDecl *, 64> randomize() override;
+ SmallVector<Decl *, 64> Randstruct::perfrandomize(const ASTContext &ctx,
+ SmallVector<Decl *, 64> fields);
  virtual void reorganize(const ASTContext &C, const RecordDecl *D,
  SmallVector<Decl *, 64> &NewOrder) const override;
 };

clang/lib/AST/RecordFieldReorganizer.cpp

@@ -144,14 +144,16 @@ bool BitfieldRun::canFit(size_t size) const {
 
 bool BitfieldRun::isBitfieldRun() const { return true; }
 
-SmallVector<Decl *, 64> randomize(SmallVector<Decl *, 64> fields) {
+SmallVector<Decl *, 64> Randstruct::randomize(SmallVector<Decl *, 64> fields) {
  std::seed_seq Seq(RandstructSeed.begin(), RandstructSeed.end());
  auto rng = std::default_random_engine{Seq};
  std::shuffle(std::begin(fields), std::end(fields), rng);
  return fields;
 }
 
-SmallVector<Decl *, 64> perfrandomize(const ASTContext &ctx,
+Randstruct::Randstruct(std::String Seed) { RandstructSeed = Seed; }
+
+SmallVector<Decl *, 64> Randstruct::perfrandomize(const ASTContext &ctx,
  SmallVector<Decl *, 64> fields) {
  // All of the buckets produced by best-effort cache-line algorithm.
  std::vector<std::unique_ptr<Bucket>> buckets;