[IRGen] Fix associated type resilience for 32-bit platforms.

Author: DougGregor

lib/IRGen/GenProto.cpp

@@ -3426,7 +3426,8 @@ static llvm::Value *computeResilientWitnessTableIndex(
   auto ptrSize = dataLayout.getTypeAllocSizeInBits(IGF.IGM.Int8PtrTy);
   assert(protoReqSize >= ptrSize && "> 64-bit pointers?");
   assert((protoReqSize % ptrSize == 0) && "Must be evenly divisible");
-  unsigned factor = (protoReqSize / ptrSize) * 8;
+  (void)ptrSize;
+  unsigned factor = protoReqSize / 8;
   auto factorConstant = llvm::ConstantInt::get(IGF.IGM.IntPtrTy, factor);
   return IGF.Builder.CreateUDiv(offset, factorConstant);
 }

test/IRGen/protocol_resilience_descriptors.swift

@@ -58,7 +58,7 @@ where Element: ProtocolWithRequirements, Element.T == Y {
 
 // CHECK-USAGE: define{{( dllexport)?}}{{( protected)?}} swiftcc %swift.type* @"$S31protocol_resilience_descriptors17assocTypeMetadatay1TQzmxm010resilient_A024ProtocolWithRequirementsRzlF"(%swift.type*, %swift.type* [[PWD:%.*]], i8** [[WTABLE:%.*]])
 public func assocTypeMetadata<PWR: ProtocolWithRequirements>(_: PWR.Type) -> PWR.T.Type {
-  // CHECK-USAGE: [[WITNESS_ADDR:%.*]] = getelementptr inbounds i8*, i8** %PWR.ProtocolWithRequirements, [[INT]] udiv ([[INT]] sub ([[INT]] ptrtoint (%swift.protocol_requirement* @"$S1T18resilient_protocol24ProtocolWithRequirementsPTl" to [[INT]]), [[INT]] ptrtoint (%swift.protocol_requirement* @"$S18resilient_protocol24ProtocolWithRequirementsTL" to [[INT]])), [[INT]] {{(8|16)}})
-  // CHECK-USAGE: load i8*, i8** [[WITNESS_ADDR]], align 8
+  // CHECK-USAGE: [[WITNESS_ADDR:%.*]] = getelementptr inbounds i8*, i8** %PWR.ProtocolWithRequirements, [[INT]] udiv ([[INT]] sub ([[INT]] ptrtoint (%swift.protocol_requirement* @"$S1T18resilient_protocol24ProtocolWithRequirementsPTl" to [[INT]]), [[INT]] ptrtoint (%swift.protocol_requirement* @"$S18resilient_protocol24ProtocolWithRequirementsTL" to [[INT]])), [[INT]] 8
+  // CHECK-USAGE: load i8*, i8** [[WITNESS_ADDR]], align {{(4|8)}}
   return PWR.T.self
 }

test/IRGen/witness_table_indirect_conformances.swift

@@ -33,7 +33,7 @@ struct Z: P2 {
 // CHECK: @"$S35witness_table_indirect_conformances1WVAA2P3AAWP" = hidden constant [5 x i8*] [
 // CHECK-SAME: @"$S35witness_table_indirect_conformances1WVAA2P3AAMc"
 // CHECK-SAME: i8* bitcast (i8** ()* @"$S35witness_table_indirect_conformances1YVAA1QAAWa" to i8*),
-// CHECK-SAME: i8* bitcast (%swift.metadata_response (i64)* @"$S35witness_table_indirect_conformances1ZVMa" to i8*),
+// CHECK-SAME: i8* bitcast (%swift.metadata_response ([[INT]])* @"$S35witness_table_indirect_conformances1ZVMa" to i8*),
 // CHECK-SAME: i8* bitcast (void (%T35witness_table_indirect_conformances1ZV*, %T35witness_table_indirect_conformances1WV*, %swift.type*, i8**)* @"$S35witness_table_indirect_conformances1WVAA2P3A2aDP08getAssocE00gE0QzyFTW" to i8*)]
 struct W: P3 {
 	typealias AssocP3 = Z