Merge pull request #79340 from kateinoigakukun/pr-3e00aa82837cda0d107594c8b38a7446d55c768b

kateinoigakukun · web-flow · commit 3745dd14638b · 2025-02-14T05:39:54.000+09:00
diff --git a/include/swift/AST/Attr.h b/include/swift/AST/Attr.h
@@ -2962,7 +2962,7 @@ class AllowFeatureSuppressionAttr final
 
   ArrayRef<Identifier> getSuppressedFeatures() const {
     return {getTrailingObjects<Identifier>(),
-            Bits.AllowFeatureSuppressionAttr.NumFeatures};
+            static_cast<size_t>(Bits.AllowFeatureSuppressionAttr.NumFeatures)};
   }
 
   static bool classof(const DeclAttribute *DA) {
diff --git a/include/swift/AST/Decl.h b/include/swift/AST/Decl.h
@@ -8676,7 +8676,7 @@ class EnumCaseDecl final : public Decl,
   /// Get the list of elements declared in this case.
   ArrayRef<EnumElementDecl *> getElements() const {
     return {getTrailingObjects<EnumElementDecl *>(),
-            Bits.EnumCaseDecl.NumElements};
+            static_cast<size_t>(Bits.EnumCaseDecl.NumElements)};
   }
   SourceRange getSourceRange() const;
 
diff --git a/include/swift/AST/Expr.h b/include/swift/AST/Expr.h
@@ -2455,10 +2455,10 @@ class CollectionExpr : public Expr {
 
   /// Retrieve the elements stored in the collection.
   ArrayRef<Expr *> getElements() const {
-    return {getTrailingObjectsPointer(), Bits.CollectionExpr.NumSubExprs};
+    return {getTrailingObjectsPointer(), static_cast<size_t>(Bits.CollectionExpr.NumSubExprs)};
   }
   MutableArrayRef<Expr *> getElements() {
-    return {getTrailingObjectsPointer(), Bits.CollectionExpr.NumSubExprs};
+    return {getTrailingObjectsPointer(), static_cast<size_t>(Bits.CollectionExpr.NumSubExprs)};
   }
   Expr *getElement(unsigned i) const { return getElements()[i]; }
   void setElement(unsigned i, Expr *E) { getElements()[i] = E; }
@@ -3519,7 +3519,7 @@ class ErasureExpr final : public ImplicitConversionExpr,
   /// that corresponding protocol).
   ArrayRef<ProtocolConformanceRef> getConformances() const {
     return {getTrailingObjects<ProtocolConformanceRef>(),
-            Bits.ErasureExpr.NumConformances };
+            static_cast<size_t>(Bits.ErasureExpr.NumConformances) };
   }
 
   /// Retrieve the conversion expressions mapping requirements from any
@@ -3721,7 +3721,7 @@ class UnresolvedSpecializeExpr final : public Expr,
   /// been bound to archetypes of the entity to be specialized.
   ArrayRef<TypeRepr *> getUnresolvedParams() const {
     return {getTrailingObjects<TypeRepr *>(),
-            Bits.UnresolvedSpecializeExpr.NumUnresolvedParams};
+            static_cast<size_t>(Bits.UnresolvedSpecializeExpr.NumUnresolvedParams)};
   }
   
   SourceLoc getLoc() const { return LAngleLoc; }
@@ -3991,11 +3991,11 @@ class SequenceExpr final : public Expr,
   unsigned getNumElements() const { return Bits.SequenceExpr.NumElements; }
 
   MutableArrayRef<Expr*> getElements() {
-    return {getTrailingObjects<Expr*>(), Bits.SequenceExpr.NumElements};
+    return {getTrailingObjects<Expr*>(), static_cast<size_t>(Bits.SequenceExpr.NumElements)};
   }
 
   ArrayRef<Expr*> getElements() const {
-    return {getTrailingObjects<Expr*>(), Bits.SequenceExpr.NumElements};
+    return {getTrailingObjects<Expr*>(), static_cast<size_t>(Bits.SequenceExpr.NumElements)};
   }
 
   Expr *getElement(unsigned i) const {
@@ -4594,7 +4594,7 @@ class CaptureListExpr final : public Expr,
 
   ArrayRef<CaptureListEntry> getCaptureList() {
     return {getTrailingObjects<CaptureListEntry>(),
-            Bits.CaptureListExpr.NumCaptures};
+            static_cast<size_t>(Bits.CaptureListExpr.NumCaptures)};
   }
   AbstractClosureExpr *getClosureBody() { return closureBody; }
   const AbstractClosureExpr *getClosureBody() const { return closureBody; }
diff --git a/include/swift/AST/Stmt.h b/include/swift/AST/Stmt.h
@@ -212,12 +212,12 @@ class BraceStmt final : public Stmt,
 
   /// The elements contained within the BraceStmt.
   MutableArrayRef<ASTNode> getElements() {
-    return {getTrailingObjects<ASTNode>(), Bits.BraceStmt.NumElements};
+    return {getTrailingObjects<ASTNode>(), static_cast<size_t>(Bits.BraceStmt.NumElements)};
   }
 
   /// The elements contained within the BraceStmt (const version).
   ArrayRef<ASTNode> getElements() const {
-    return {getTrailingObjects<ASTNode>(), Bits.BraceStmt.NumElements};
+    return {getTrailingObjects<ASTNode>(), static_cast<size_t>(Bits.BraceStmt.NumElements)};
   }
 
   ASTNode findAsyncNode();
@@ -330,10 +330,10 @@ class YieldStmt final
   SourceLoc getEndLoc() const;
 
   ArrayRef<Expr*> getYields() const {
-    return {getTrailingObjects<Expr*>(), Bits.YieldStmt.NumYields};
+    return {getTrailingObjects<Expr*>(), static_cast<size_t>(Bits.YieldStmt.NumYields)};
   }
   MutableArrayRef<Expr*> getMutableYields() {
-    return {getTrailingObjects<Expr*>(), Bits.YieldStmt.NumYields};
+    return {getTrailingObjects<Expr*>(), static_cast<size_t>(Bits.YieldStmt.NumYields)};
   }
   
   static bool classof(const Stmt *S) { return S->getKind() == StmtKind::Yield; }
@@ -1259,11 +1259,11 @@ class CaseStmt final
   }
 
   ArrayRef<CaseLabelItem> getCaseLabelItems() const {
-    return {getTrailingObjects<CaseLabelItem>(), Bits.CaseStmt.NumPatterns};
+    return {getTrailingObjects<CaseLabelItem>(), static_cast<size_t>(Bits.CaseStmt.NumPatterns)};
   }
 
   MutableArrayRef<CaseLabelItem> getMutableCaseLabelItems() {
-    return {getTrailingObjects<CaseLabelItem>(), Bits.CaseStmt.NumPatterns};
+    return {getTrailingObjects<CaseLabelItem>(), static_cast<size_t>(Bits.CaseStmt.NumPatterns)};
   }
 
   unsigned getNumCaseLabelItems() const { return Bits.CaseStmt.NumPatterns; }
@@ -1448,7 +1448,7 @@ class SwitchStmt final : public LabeledStmt,
   void setSubjectExpr(Expr *e) { SubjectExpr = e; }
 
   ArrayRef<ASTNode> getRawCases() const {
-    return {getTrailingObjects<ASTNode>(), Bits.SwitchStmt.CaseCount};
+    return {getTrailingObjects<ASTNode>(), static_cast<size_t>(Bits.SwitchStmt.CaseCount)};
   }
 
 private:
@@ -1541,10 +1541,10 @@ class DoCatchStmt final
   void setBody(Stmt *s) { Body = s; }
 
   ArrayRef<CaseStmt *> getCatches() const {
-    return {getTrailingObjects<CaseStmt *>(), Bits.DoCatchStmt.NumCatches};
+    return {getTrailingObjects<CaseStmt *>(), static_cast<size_t>(Bits.DoCatchStmt.NumCatches)};
   }
   MutableArrayRef<CaseStmt *> getMutableCatches() {
-    return {getTrailingObjects<CaseStmt *>(), Bits.DoCatchStmt.NumCatches};
+    return {getTrailingObjects<CaseStmt *>(), static_cast<size_t>(Bits.DoCatchStmt.NumCatches)};
   }
 
   /// Retrieve the complete set of branches for this do-catch statement.
diff --git a/include/swift/AST/TypeRepr.h b/include/swift/AST/TypeRepr.h
@@ -917,7 +917,7 @@ class TupleTypeRepr final : public TypeRepr,
 
   ArrayRef<TupleTypeReprElement> getElements() const {
     return { getTrailingObjects<TupleTypeReprElement>(),
-             Bits.TupleTypeRepr.NumElements };
+             static_cast<size_t>(Bits.TupleTypeRepr.NumElements) };
   }
 
   void getElementTypes(SmallVectorImpl<TypeRepr *> &Types) const {
@@ -1003,7 +1003,7 @@ class CompositionTypeRepr final : public TypeRepr,
 
 public:
   ArrayRef<TypeRepr *> getTypes() const {
-    return {getTrailingObjects<TypeRepr*>(), Bits.CompositionTypeRepr.NumTypes};
+    return {getTrailingObjects<TypeRepr*>(), static_cast<size_t>(Bits.CompositionTypeRepr.NumTypes)};
   }
   SourceLoc getSourceLoc() const { return FirstTypeLoc; }
   SourceRange getCompositionRange() const { return CompositionRange; }
@@ -1494,7 +1494,7 @@ class SILBoxTypeRepr final : public TypeRepr,
   
   ArrayRef<Field> getFields() const {
     return {getTrailingObjects<Field>(),
-            Bits.SILBoxTypeRepr.NumFields};
+            static_cast<size_t>(Bits.SILBoxTypeRepr.NumFields)};
   }
   ArrayRef<TypeRepr *> getGenericArguments() const {
     return {getTrailingObjects<TypeRepr*>(),
diff --git a/include/swift/AST/Types.h b/include/swift/AST/Types.h
@@ -2824,7 +2824,7 @@ class BoundGenericType : public NominalOrBoundGenericNominalType,
 
   /// Retrieve the set of generic arguments provided at this level.
   ArrayRef<Type> getGenericArgs() const {
-    return {getTrailingObjectsPointer(), Bits.BoundGenericType.GenericArgCount};
+    return {getTrailingObjectsPointer(), static_cast<size_t>(Bits.BoundGenericType.GenericArgCount)};
   }
 
   SmallVector<Type, 2> getExpandedGenericArgs();
@@ -6365,7 +6365,7 @@ class ProtocolCompositionType final : public TypeBase,
   /// a protocol composition type; you also have to look at
   /// hasExplicitAnyObject().
   ArrayRef<Type> getMembers() const {
-    return {getTrailingObjects<Type>(), Bits.ProtocolCompositionType.Count};
+    return {getTrailingObjects<Type>(), static_cast<size_t>(Bits.ProtocolCompositionType.Count)};
   }
 
   InvertibleProtocolSet getInverses() const { return Inverses; }
@@ -6463,7 +6463,7 @@ class ParameterizedProtocolType final : public TypeBase,
 
   ArrayRef<Type> getArgs() const {
     return {getTrailingObjects<Type>(),
-            Bits.ParameterizedProtocolType.ArgCount};
+            static_cast<size_t>(Bits.ParameterizedProtocolType.ArgCount)};
   }
 
   bool requiresClass() const {
@@ -7513,7 +7513,7 @@ class ErrorUnionType final
   static Type get(const ASTContext &ctx, ArrayRef<Type> terms);
 
   ArrayRef<Type> getTerms() const {
-    return { getTrailingObjects<Type>(), Bits.ErrorUnionType.NumTerms };
+    return { getTrailingObjects<Type>(), static_cast<size_t>(Bits.ErrorUnionType.NumTerms) };
   };
 
   // Support for FoldingSet.
diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp
@@ -771,7 +771,7 @@ CaseStmt::CaseStmt(CaseParentKind parentKind, SourceLoc itemIntroducerLoc,
   }
 
   MutableArrayRef<CaseLabelItem> items{getTrailingObjects<CaseLabelItem>(),
-                                       Bits.CaseStmt.NumPatterns};
+                                       static_cast<size_t>(Bits.CaseStmt.NumPatterns)};
 
   // At the beginning mark all of our var decls as being owned by this
   // statement. In the typechecker we wireup the case stmt var decl list since

Original file line number	Diff line number	Diff line change
`@@ -2962,7 +2962,7 @@ class AllowFeatureSuppressionAttr final`
`2962`	`2962`
`2963`	`2963`	`ArrayRef<Identifier> getSuppressedFeatures() const {`
`2964`	`2964`	`return {getTrailingObjects<Identifier>(),`
`2965`		`- Bits.AllowFeatureSuppressionAttr.NumFeatures};`
	`2965`	`+ static_cast<size_t>(Bits.AllowFeatureSuppressionAttr.NumFeatures)};`
`2966`	`2966`	`}`
`2967`	`2967`
`2968`	`2968`	`static bool classof(const DeclAttribute *DA) {`
Original file line number	Diff line number	Diff line change
`@@ -8676,7 +8676,7 @@ class EnumCaseDecl final : public Decl,`
`8676`	`8676`	`/// Get the list of elements declared in this case.`
`8677`	`8677`	`ArrayRef<EnumElementDecl *> getElements() const {`
`8678`	`8678`	`return {getTrailingObjects<EnumElementDecl *>(),`
`8679`		`- Bits.EnumCaseDecl.NumElements};`
	`8679`	`+ static_cast<size_t>(Bits.EnumCaseDecl.NumElements)};`
`8680`	`8680`	`}`
`8681`	`8681`	`SourceRange getSourceRange() const;`
`8682`	`8682`
Original file line number	Diff line number	Diff line change
`@@ -212,12 +212,12 @@ class BraceStmt final : public Stmt,`
`212`	`212`
`213`	`213`	`/// The elements contained within the BraceStmt.`
`214`	`214`	`MutableArrayRef<ASTNode> getElements() {`
`215`		`- return {getTrailingObjects<ASTNode>(), Bits.BraceStmt.NumElements};`
	`215`	`+ return {getTrailingObjects<ASTNode>(), static_cast<size_t>(Bits.BraceStmt.NumElements)};`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`/// The elements contained within the BraceStmt (const version).`
`219`	`219`	`ArrayRef<ASTNode> getElements() const {`
`220`		`- return {getTrailingObjects<ASTNode>(), Bits.BraceStmt.NumElements};`
	`220`	`+ return {getTrailingObjects<ASTNode>(), static_cast<size_t>(Bits.BraceStmt.NumElements)};`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`ASTNode findAsyncNode();`
`@@ -330,10 +330,10 @@ class YieldStmt final`
`330`	`330`	`SourceLoc getEndLoc() const;`
`331`	`331`
`332`	`332`	`ArrayRef<Expr*> getYields() const {`
`333`		`- return {getTrailingObjects<Expr*>(), Bits.YieldStmt.NumYields};`
	`333`	`+ return {getTrailingObjects<Expr*>(), static_cast<size_t>(Bits.YieldStmt.NumYields)};`
`334`	`334`	`}`
`335`	`335`	`MutableArrayRef<Expr*> getMutableYields() {`
`336`		`- return {getTrailingObjects<Expr*>(), Bits.YieldStmt.NumYields};`
	`336`	`+ return {getTrailingObjects<Expr*>(), static_cast<size_t>(Bits.YieldStmt.NumYields)};`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`static bool classof(const Stmt *S) { return S->getKind() == StmtKind::Yield; }`
`@@ -1259,11 +1259,11 @@ class CaseStmt final`
`1259`	`1259`	`}`
`1260`	`1260`
`1261`	`1261`	`ArrayRef<CaseLabelItem> getCaseLabelItems() const {`
`1262`		`- return {getTrailingObjects<CaseLabelItem>(), Bits.CaseStmt.NumPatterns};`
	`1262`	`+ return {getTrailingObjects<CaseLabelItem>(), static_cast<size_t>(Bits.CaseStmt.NumPatterns)};`
`1263`	`1263`	`}`
`1264`	`1264`
`1265`	`1265`	`MutableArrayRef<CaseLabelItem> getMutableCaseLabelItems() {`
`1266`		`- return {getTrailingObjects<CaseLabelItem>(), Bits.CaseStmt.NumPatterns};`
	`1266`	`+ return {getTrailingObjects<CaseLabelItem>(), static_cast<size_t>(Bits.CaseStmt.NumPatterns)};`
`1267`	`1267`	`}`
`1268`	`1268`
`1269`	`1269`	`unsigned getNumCaseLabelItems() const { return Bits.CaseStmt.NumPatterns; }`
`@@ -1448,7 +1448,7 @@ class SwitchStmt final : public LabeledStmt,`
`1448`	`1448`	`void setSubjectExpr(Expr *e) { SubjectExpr = e; }`
`1449`	`1449`
`1450`	`1450`	`ArrayRef<ASTNode> getRawCases() const {`
`1451`		`- return {getTrailingObjects<ASTNode>(), Bits.SwitchStmt.CaseCount};`
	`1451`	`+ return {getTrailingObjects<ASTNode>(), static_cast<size_t>(Bits.SwitchStmt.CaseCount)};`
`1452`	`1452`	`}`
`1453`	`1453`
`1454`	`1454`	`private:`
`@@ -1541,10 +1541,10 @@ class DoCatchStmt final`
`1541`	`1541`	`void setBody(Stmt *s) { Body = s; }`
`1542`	`1542`
`1543`	`1543`	`ArrayRef<CaseStmt *> getCatches() const {`
`1544`		`- return {getTrailingObjects<CaseStmt *>(), Bits.DoCatchStmt.NumCatches};`
	`1544`	`+ return {getTrailingObjects<CaseStmt *>(), static_cast<size_t>(Bits.DoCatchStmt.NumCatches)};`
`1545`	`1545`	`}`
`1546`	`1546`	`MutableArrayRef<CaseStmt *> getMutableCatches() {`
`1547`		`- return {getTrailingObjects<CaseStmt *>(), Bits.DoCatchStmt.NumCatches};`
	`1547`	`+ return {getTrailingObjects<CaseStmt *>(), static_cast<size_t>(Bits.DoCatchStmt.NumCatches)};`
`1548`	`1548`	`}`
`1549`	`1549`
`1550`	`1550`	`/// Retrieve the complete set of branches for this do-catch statement.`
Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,7 @@ CaseStmt::CaseStmt(CaseParentKind parentKind, SourceLoc itemIntroducerLoc,`
`771`	`771`	`}`
`772`	`772`
`773`	`773`	`MutableArrayRef<CaseLabelItem> items{getTrailingObjects<CaseLabelItem>(),`
`774`		`- Bits.CaseStmt.NumPatterns};`
	`774`	`+ static_cast<size_t>(Bits.CaseStmt.NumPatterns)};`
`775`	`775`
`776`	`776`	`// At the beginning mark all of our var decls as being owned by this`
`777`	`777`	`// statement. In the typechecker we wireup the case stmt var decl list since`