Merge pull request #40970 from xedin/add-padding-to-generic-env-desc

[IRGen] Pad generic environment descriptor before adding requirements

Author: xedin

lib/IRGen/ConstantBuilder.h

@@ -118,7 +118,7 @@ class ConstantAggregateBuilderBase
   }
 
   void addAlignmentPadding(Alignment align) {
-    auto misalignment = getNextOffsetFromGlobal() % IGM().getPointerAlignment();
+    auto misalignment = getNextOffsetFromGlobal() % align;
     if (misalignment != Size(0))
       add(llvm::ConstantAggregateZero::get(
             llvm::ArrayType::get(IGM().Int8Ty,

lib/IRGen/GenProto.cpp

@@ -3730,6 +3730,11 @@ llvm::Constant *IRGenModule::getAddrOfGenericEnvironment(
                           .getIntValue());
         });
 
+        // Need to pad the structure after generic parameters
+        // up to four bytes because generic requirements that
+        // follow expect that alignment.
+        fields.addAlignmentPadding(Alignment(4));
+
         // Generic requirements
         irgen::addGenericRequirements(*this, fields, signature,
                                       signature.getRequirements());