Merge pull request #4155 from swiftwasm/main

[pull] swiftwasm from main

Author: MaxDesiatov

lib/IRGen/ConstantBuilder.h

@@ -143,7 +143,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());

stdlib/public/Reflection/TypeRef.cpp

@@ -545,19 +545,14 @@ class DemanglingForTypeRef
 
   Demangle::NodePointer
   visitBoundGenericTypeRef(const BoundGenericTypeRef *BG) {
-    Node::Kind nodeKind;
     Node::Kind genericNodeKind;
     if (BG->isStruct()) {
-      nodeKind = Node::Kind::Structure;
       genericNodeKind = Node::Kind::BoundGenericStructure;
     } else if (BG->isEnum()) {
-      nodeKind = Node::Kind::Enum;
       genericNodeKind = Node::Kind::BoundGenericEnum;
     } else if (BG->isClass()) {
-      nodeKind = Node::Kind::Class;
       genericNodeKind = Node::Kind::BoundGenericClass;
     } else {
-      nodeKind = Node::Kind::OtherNominalType;
       genericNodeKind = Node::Kind::BoundGenericOtherNominalType;
     }
     auto unspecializedType = Dem.demangleType(BG->getMangledName());

utils/build_swift/build_swift/migration.py

@@ -8,7 +8,7 @@
 
 
 """
-Temporary module with functionaly used to migrate away from build-script-impl.
+Temporary module with functionality used to migrate away from build-script-impl.
 """