[PATCH] D60164: [AIX] SelectionDAGNodes.h: Pack bit-fields that are meant to be packed

[Hubert Tong via Phabricator via llvm-commits]

hubert.reinterpretcast created this revision.
hubert.reinterpretcast added reviewers: xingxue, sfertile, jasonliu.
Herald added a subscriber: jsji.
Herald added a project: LLVM.

Certain classes in the subject file are expected to provide different views of a two-byte field as a collection of various bit-fields. On AIX, the canonical layout of bit-fields would cause these classes to span four bytes. Applying the `pack` pragma for compilers that employ the AIX canonical layout allows these classes to fit within the expected two bytes. In the future, the pragma would also likely need to be applied when building with Clang on AIX.


Repository:
  rL LLVM

https://reviews.llvm.org/D60164

Files:
  include/llvm/CodeGen/SelectionDAGNodes.h


Index: include/llvm/CodeGen/SelectionDAGNodes.h
===================================================================
--- include/llvm/CodeGen/SelectionDAGNodes.h
+++ include/llvm/CodeGen/SelectionDAGNodes.h
@@ -488,6 +488,17 @@
   // SubclassData.  These are designed to fit within a uint16_t so they pack
   // with NodeType.
 
+#if defined(_AIX) && (!defined(__GNUC__) || defined(__ibmxl__))
+// Except for GCC; by default, AIX compilers store bit-fields in 4-byte words
+// and give the `pack` pragma push semantics.
+#define BEGIN_TWO_BYTE_PACK() _Pragma("pack(2)")
+#define END_TWO_BYTE_PACK() _Pragma("pack(pop)")
+#else
+#define BEGIN_TWO_BYTE_PACK()
+#define END_TWO_BYTE_PACK()
+#endif
+
+BEGIN_TWO_BYTE_PACK()
   class SDNodeBitfields {
     friend class SDNode;
     friend class MemIntrinsicSDNode;
@@ -560,6 +571,9 @@
     LoadSDNodeBitfields LoadSDNodeBits;
     StoreSDNodeBitfields StoreSDNodeBits;
   };
+END_TWO_BYTE_PACK()
+#undef BEGIN_TWO_BYTE_PACK
+#undef END_TWO_BYTE_PACK
 
   // RawSDNodeBits must cover the entirety of the union.  This means that all of
   // the union's members must have size <= RawSDNodeBits.  We write the RHS as


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60164.193387.patch
Type: text/x-patch
Size: 1159 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190402/dc663782/attachment.bin>