Merge pull request #33 from clang-randstruct/skip-unions

Skip unions

Author: Tim Pugh

clang/include/clang/Basic/DiagnosticASTKinds.td

@@ -343,4 +343,6 @@ def warn_padded_struct_size : Warning<
   InGroup<Padded>, DefaultIgnore;
 def warn_unnecessary_packed : Warning<
   "packed attribute is unnecessary for %0">, InGroup<Packed>, DefaultIgnore;
+def warn_randomize_attr_union : Warning<
+  "union declared with 'randomize_layout' attribute">, InGroup<DiagGroup<"randomize-layout">>;
 }

clang/lib/AST/RecordLayoutBuilder.cpp

@@ -2989,10 +2989,16 @@ ASTContext::getASTRecordLayout(const RecordDecl *D) const {
   const ASTRecordLayout *NewEntry = nullptr;
 
   bool ShouldBeRandomized = D->getAttr<RandomizeLayoutAttr>() != nullptr;
-   
   if (ShouldBeRandomized) {
-    Randstruct randstruct;
-    randstruct.reorganizeFields(*this,D);
+    // There is no technical benefit to randomizing the fields of a union
+    // since they all share the same offset of zero.
+    if (D->isUnion()) {
+      getDiagnostics().Report(D->getLocation(), diag::warn_randomize_attr_union);
+    }
+    else {
+      Randstruct randstruct;
+      randstruct.reorganizeFields(*this,D);
+    }
   }
 
   if (isMsLayout(*this)) {