Added basic implementation of auto selection for strucutres of only function pointers

Author: Jafosterja

clang/include/clang/AST/RecordFieldReorganizer.h

@@ -34,6 +34,7 @@ class RecordFieldReorganizer {
 private:
   void commit(const RecordDecl *D,
               SmallVectorImpl<Decl *> &NewFieldOrder) const;
+  bool autostructselect(const SmallVector<Decl *,64> fields) const;
 };
 
 class Randstruct : public RecordFieldReorganizer {

clang/lib/AST/RecordFieldReorganizer.cpp

@@ -35,7 +35,11 @@ void RecordFieldReorganizer::reorganizeFields(const ASTContext &C,
     mutateGuard.insert(f);
     fields.push_back(f);
   }
-
+  if(D->getAttr<RandomizeLayoutAttr>() == nullptr){
+    if(!autostructselect(fields)){
+      return;
+    }
+  }
   // Now allow subclass implementations to reorder the fields
   reorganize(C, D, fields);
 
@@ -50,7 +54,20 @@ void RecordFieldReorganizer::reorganizeFields(const ASTContext &C,
 
   commit(D, fields);
 }
-
+bool RecordFieldReorganizer::autostructselect(const SmallVector<Decl *, 64> fields) const {
+
+  bool Select = true;
+  for (auto f : fields){
+    auto t = f->getFunctionType();
+    auto s = ((FieldDecl *)f)->getNameAsString();
+    llvm::errs() << "Function " << s << " type: " << t << "\n";    
+    if(t == nullptr){
+      Select = false;
+      break;
+    }
+  }
+  return Select;
+}
 void RecordFieldReorganizer::commit(
     const RecordDecl *D, SmallVectorImpl<Decl *> &NewFieldOrder) const {
   Decl *First, *Last;

clang/lib/AST/RecordLayoutBuilder.cpp

@@ -2988,7 +2988,7 @@ ASTContext::getASTRecordLayout(const RecordDecl *D) const {
   const ASTRecordLayout *NewEntry = nullptr;
 
   bool ShouldBeRandomized = D->getAttr<RandomizeLayoutAttr>() != nullptr;
-  if (ShouldBeRandomized) {
+  if (true) {
 	  Randstruct randstruct;
 	  randstruct.reorganizeFields(*this, D);
   }