Merge pull request #16487 from slavapestov/sundry-fixes

Sundry fixes

Author: slavapestov

lib/IRGen/GenEnum.cpp

@@ -5109,8 +5109,7 @@ EnumImplStrategy::get(TypeConverter &TC, SILType type, EnumDecl *theEnum) {
     origArgType = theEnum->mapTypeIntoContext(origArgType);
 
     auto origArgLoweredTy = TC.IGM.getLoweredType(origArgType);
-    auto origArgTI = TC.tryGetCompleteTypeInfo(origArgLoweredTy.getASTType());
-    assert(origArgTI && "didn't complete type info?!");
+    auto *origArgTI = &TC.getCompleteTypeInfo(origArgLoweredTy.getASTType());
 
     // If the unsubstituted argument contains a generic parameter type, or
     // is not fixed-size in all resilience domains that have knowledge of

lib/IRGen/GenRecord.h

@@ -524,7 +524,6 @@ class RecordTypeBuilder {
       auto &astField = astFields[i];
       // Compute the field's type info.
       auto &fieldTI = IGM.getTypeInfo(asImpl()->getType(astField));
-      assert(fieldTI.isComplete());
       fieldTypesForLayout.push_back(&fieldTI);
 
       fields.push_back(FieldImpl(asImpl()->getFieldInfo(i, astField, fieldTI)));

lib/IRGen/GenType.cpp

@@ -1365,17 +1365,7 @@ const TypeInfo &IRGenModule::getTypeInfoForLowered(CanType T) {
 const TypeInfo &TypeConverter::getCompleteTypeInfo(CanType T) {
   auto entry = getTypeEntry(T);
   assert(entry.is<const TypeInfo*>() && "getting TypeInfo recursively!");
-  auto &ti = *entry.get<const TypeInfo*>();
-  assert(ti.isComplete());
-  return ti;
-}
-
-const TypeInfo *TypeConverter::tryGetCompleteTypeInfo(CanType T) {
-  auto entry = getTypeEntry(T);
-  if (!entry.is<const TypeInfo*>()) return nullptr;
-  auto &ti = *entry.get<const TypeInfo*>();
-  if (!ti.isComplete()) return nullptr;
-  return &ti;
+  return *entry.get<const TypeInfo*>();
 }
 
 ArchetypeType *TypeConverter::getExemplarArchetype(ArchetypeType *t) {

lib/IRGen/GenType.h

@@ -138,7 +138,6 @@ class TypeConverter {
 
   TypeCacheEntry getTypeEntry(CanType type);
   const TypeInfo &getCompleteTypeInfo(CanType type);
-  const TypeInfo *tryGetCompleteTypeInfo(CanType type);
   const LoadableTypeInfo &getNativeObjectTypeInfo();
   const LoadableTypeInfo &getUnknownObjectTypeInfo();
   const LoadableTypeInfo &getBridgeObjectTypeInfo();

lib/IRGen/TypeInfo.h

@@ -92,8 +92,6 @@ class TypeInfo {
 
   friend class TypeConverter;
 
-  enum : unsigned { InvalidAlignmentShift = 63 };
-
 protected:
   union {
     uint64_t OpaqueBits;
@@ -144,10 +142,10 @@ class TypeInfo {
            IsFixedSize_t alwaysFixedSize,
            SpecialTypeInfoKind stik) : StorageType(Type) {
     assert(stik >= SpecialTypeInfoKind::Fixed || !alwaysFixedSize);
+    assert(!A.isZero() && "Invalid alignment");
     Bits.OpaqueBits = 0;
     Bits.TypeInfo.Kind = unsigned(stik);
-    Bits.TypeInfo.AlignmentShift = A.isZero() ? InvalidAlignmentShift
-                                              : llvm::Log2_32(A.getValue());
+    Bits.TypeInfo.AlignmentShift = llvm::Log2_32(A.getValue());
     Bits.TypeInfo.POD = pod;
     Bits.TypeInfo.BitwiseTakable = bitwiseTakable;
     Bits.TypeInfo.SubclassKind = InvalidSubclassKind;
@@ -188,11 +186,6 @@ class TypeInfo {
     return static_cast<const T &>(*this);
   }
 
-  /// Whether this type info has been completely converted.
-  bool isComplete() const {
-    return Bits.TypeInfo.AlignmentShift != InvalidAlignmentShift;
-  }
-
   /// Whether this type is known to be empty.
   bool isKnownEmpty(ResilienceExpansion expansion) const;
 
@@ -263,7 +256,6 @@ class TypeInfo {
 
   Alignment getBestKnownAlignment() const {
     auto Shift = Bits.TypeInfo.AlignmentShift;
-    assert(Shift != InvalidAlignmentShift);
     return Alignment(1ull << Shift);
   }
 

lib/SIL/SILInstruction.cpp

@@ -1304,7 +1304,7 @@ SILInstructionResultArray::SILInstructionResultArray(
   auto TRangeBegin = TypedRange.begin();
   auto TRangeIter = TRangeBegin;
   auto TRangeEnd = TypedRange.end();
-  assert(MVResults.size() == unsigned(std::distance(VRangeBegin, VRangeEnd)));
+  assert(MVResults.size() == unsigned(std::distance(TRangeBegin, TRangeEnd)));
   for (unsigned i : indices(MVResults)) {
     assert(SILValue(&MVResults[i]) == (*this)[i]);
     assert(SILValue(&MVResults[i])->getType() == (*this)[i]->getType());

lib/SILOptimizer/SILCombiner/SILCombinerCastVisitors.cpp

@@ -192,7 +192,6 @@ visitPointerToAddressInst(PointerToAddressInst *PTAI) {
 SILInstruction *
 SILCombiner::visitUncheckedAddrCastInst(UncheckedAddrCastInst *UADCI) {
   Builder.setCurrentDebugScope(UADCI->getDebugScope());
-  SILModule &Mod = UADCI->getModule();
 
   // (unchecked-addr-cast (unchecked-addr-cast x X->Y) Y->Z)
   //   ->