Move Randomization to getASTRecordLayout

clang/lib/AST/RecordLayoutBuilder.cpp

@@ -1365,23 +1365,6 @@ void ItaniumRecordLayoutBuilder::LayoutFields(const RecordDecl *D) {
   bool InsertExtraPadding = D->mayInsertExtraPadding(/*EmitRemark=*/true);
   bool HasFlexibleArrayMember = D->hasFlexibleArrayMember();
 
-  // A staging area to easily reorder the fields
-  SmallVector<Decl *, 64> fields;
-  for (auto f : D->fields()) {
-    fields.push_back(f);
-  }
-
-  bool ShouldBeRandomized = D->getAttr<RandomizeLayoutAttr>() != nullptr;
-  if (ShouldBeRandomized) {
-      // FIXME Should call our Randstruct code once we port it.
-      auto rng = std::default_random_engine {};
-      std::shuffle(std::begin(fields), std::end(fields), rng);
-
-      // This will rebuild the Decl chain of fields
-      D->reorderFields(fields);
-  }
-
-
   for (auto I = D->field_begin(), End = D->field_end(); I != End; ++I) {
     auto Next(I);
     ++Next;
@@ -3005,6 +2988,24 @@ ASTContext::getASTRecordLayout(const RecordDecl *D) const {
 
   const ASTRecordLayout *NewEntry = nullptr;
 
+  // FIXME Randstruct code should be called here!
+  // A staging area to easily reorder the fields
+  SmallVector<Decl *, 64> fields;
+  for (auto f : D->fields()) {
+    fields.push_back(f);
+  }
+
+  bool ShouldBeRandomized = D->getAttr<RandomizeLayoutAttr>() != nullptr;
+  if (ShouldBeRandomized) {
+      // FIXME Should call our Randstruct code once we port it.
+      auto rng = std::default_random_engine {};
+      std::shuffle(std::begin(fields), std::end(fields), rng);
+
+      // This will rebuild the Decl chain of fields
+      D->reorderFields(fields);
+  }
+  // FIXME end Randstruct code
+
   if (isMsLayout(*this)) {
     MicrosoftRecordLayoutBuilder Builder(*this);
     if (const auto *RD = dyn_cast<CXXRecordDecl>(D)) {