Refactored code for better readability

Author: Jafosterja

clang/include/clang/AST/RecordFieldReorganizer.h

@@ -39,7 +39,7 @@ class RecordFieldReorganizer {
 class Randstruct : public RecordFieldReorganizer {
 public:  
 /// Determines if the Record can be safely and easily randomized based on certain criteria (see implementation).
-  bool isTriviallyRandomizable(const RecordDecl *D) const;
+  static bool isTriviallyRandomizable(const RecordDecl *D);
 protected:
   virtual void reorganize(const ASTContext &C, const RecordDecl *D,
                           SmallVector<Decl *, 64> &NewOrder) const override;

clang/lib/AST/RecordFieldReorganizer.cpp

@@ -247,8 +247,10 @@ void Randstruct::reorganize(const ASTContext &C, const RecordDecl *D,
   SmallVector<Decl *, 64> randomized = perfrandomize(C, NewOrder);
   NewOrder = randomized;
 }
-bool Randstruct::isTriviallyRandomizable(const RecordDecl *D) const {
- 
+bool Randstruct::isTriviallyRandomizable(const RecordDecl *D) {
+  /*if(D->getAttr<NoRandomizeLayoutAttr>() != nullptr){
+    return false;
+  }*/
   for (auto f : D->fields()){
     //If an element of the structure does not have a 
     //function type is not a function pointer

clang/lib/AST/RecordLayoutBuilder.cpp

@@ -2986,9 +2986,9 @@ ASTContext::getASTRecordLayout(const RecordDecl *D) const {
   if (Entry) return *Entry;
 
   const ASTRecordLayout *NewEntry = nullptr;
-  Randstruct randstruct;
-  bool ShouldBeRandomized = randstruct.isTriviallyRandomizable(D) || D->getAttr<RandomizeLayoutAttr>() != nullptr;
+  bool ShouldBeRandomized = Randstruct::isTriviallyRandomizable(D) || D->getAttr<RandomizeLayoutAttr>() != nullptr;
   if(ShouldBeRandomized){
+    Randstruct randstruct;
     randstruct.reorganizeFields(*this, D);  
   }