Address -Wswitch-default issues (#54580)

NSProgrammer · meta-codesync[bot] · commit 4bf8204391c6 · 2025-11-18T08:55:32.000-08:00
Summary: Pull Request resolved: #54580 Changelog: [iOS] [Fixed] - Fix undefined behavior for values outside of enum range in generated `switch` methods in Objective-C. Differential Revision: D87282978 fbshipit-source-id: 12b74e0525d30fcc0ff4f9d8e84c930d923cce5a
diff --git a/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
@@ -421,6 +421,8 @@ static inline std::string toString(const EnumPropNativeComponentViewAlignment &v
     case EnumPropNativeComponentViewAlignment::Top: return \\"top\\";
     case EnumPropNativeComponentViewAlignment::Center: return \\"center\\";
     case EnumPropNativeComponentViewAlignment::BottomRight: return \\"bottom-right\\";
+    default:
+      abort();
   }
 }
 
@@ -447,8 +449,9 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
     case 60:
       result = EnumPropNativeComponentViewIntervals::Intervals60;
       return;
+    default:
+      abort();
   }
-  abort();
 }
 
 static inline std::string toString(const EnumPropNativeComponentViewIntervals &value) {
@@ -457,6 +460,8 @@ static inline std::string toString(const EnumPropNativeComponentViewIntervals &v
     case EnumPropNativeComponentViewIntervals::Intervals15: return \\"15\\";
     case EnumPropNativeComponentViewIntervals::Intervals30: return \\"30\\";
     case EnumPropNativeComponentViewIntervals::Intervals60: return \\"60\\";
+    default:
+      abort();
   }
 }
 
@@ -467,6 +472,8 @@ static inline folly::dynamic toDynamic(const EnumPropNativeComponentViewInterval
     case EnumPropNativeComponentViewIntervals::Intervals15: return 15;
     case EnumPropNativeComponentViewIntervals::Intervals30: return 30;
     case EnumPropNativeComponentViewIntervals::Intervals60: return 60;
+    default:
+      abort();
   }
 }
 #endif
@@ -926,6 +933,8 @@ static inline std::string toString(const ObjectPropsNativeComponentStringEnumPro
   switch (value) {
     case ObjectPropsNativeComponentStringEnumProp::Small: return \\"small\\";
     case ObjectPropsNativeComponentStringEnumProp::Large: return \\"large\\";
+    default:
+      abort();
   }
 }
 
@@ -946,14 +955,17 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
     case 1:
       result = ObjectPropsNativeComponentIntEnumProp::IntEnumProp1;
       return;
+    default:
+      abort();
   }
-  abort();
 }
 
 static inline std::string toString(const ObjectPropsNativeComponentIntEnumProp &value) {
   switch (value) {
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp0: return \\"0\\";
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return \\"1\\";
+    default:
+      abort();
   }
 }
 
@@ -962,6 +974,8 @@ static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentIntEnumPr
   switch (value) {
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp0: return 0;
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return 1;
+    default:
+      abort();
   }
 }
 #endif
diff --git a/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
@@ -421,6 +421,8 @@ static inline std::string toString(const EnumPropNativeComponentViewAlignment &v
     case EnumPropNativeComponentViewAlignment::Top: return \\"top\\";
     case EnumPropNativeComponentViewAlignment::Center: return \\"center\\";
     case EnumPropNativeComponentViewAlignment::BottomRight: return \\"bottom-right\\";
+    default:
+      abort();
   }
 }
 
@@ -447,8 +449,9 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
     case 60:
       result = EnumPropNativeComponentViewIntervals::Intervals60;
       return;
+    default:
+      abort();
   }
-  abort();
 }
 
 static inline std::string toString(const EnumPropNativeComponentViewIntervals &value) {
@@ -457,6 +460,8 @@ static inline std::string toString(const EnumPropNativeComponentViewIntervals &v
     case EnumPropNativeComponentViewIntervals::Intervals15: return \\"15\\";
     case EnumPropNativeComponentViewIntervals::Intervals30: return \\"30\\";
     case EnumPropNativeComponentViewIntervals::Intervals60: return \\"60\\";
+    default:
+      abort();
   }
 }
 
@@ -467,6 +472,8 @@ static inline folly::dynamic toDynamic(const EnumPropNativeComponentViewInterval
     case EnumPropNativeComponentViewIntervals::Intervals15: return 15;
     case EnumPropNativeComponentViewIntervals::Intervals30: return 30;
     case EnumPropNativeComponentViewIntervals::Intervals60: return 60;
+    default:
+      abort();
   }
 }
 #endif
@@ -926,6 +933,8 @@ static inline std::string toString(const ObjectPropsNativeComponentStringEnumPro
   switch (value) {
     case ObjectPropsNativeComponentStringEnumProp::Small: return \\"small\\";
     case ObjectPropsNativeComponentStringEnumProp::Large: return \\"large\\";
+    default:
+      abort();
   }
 }
 
@@ -946,14 +955,17 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
     case 1:
       result = ObjectPropsNativeComponentIntEnumProp::IntEnumProp1;
       return;
+    default:
+      abort();
   }
-  abort();
 }
 
 static inline std::string toString(const ObjectPropsNativeComponentIntEnumProp &value) {
   switch (value) {
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp0: return \\"0\\";
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return \\"1\\";
+    default:
+      abort();
   }
 }
 
@@ -962,6 +974,8 @@ static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentIntEnumPr
   switch (value) {
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp0: return 0;
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return 1;
+    default:
+      abort();
   }
 }
 #endif
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
@@ -124,6 +124,8 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 static inline std::string toString(const ${enumName} &value) {
   switch (value) {
     ${toCases}
+    default:
+      abort();
   }
 }
 
@@ -154,20 +156,25 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   assert(value.hasType<int>());
   auto integerValue = (int)value;
   switch (integerValue) {${fromCases}
+    default:
+      abort();
   }
-  abort();
 }
 
 static inline std::string toString(const ${enumName} &value) {
   switch (value) {
     ${toCases}
+    default:
+      abort();
   }
 }
 
 #ifdef RN_SERIALIZABLE_STATE
 static inline folly::dynamic toDynamic(const ${enumName} &value) {
   switch (value) {
     ${toDynamicCases}
+    default:
+      abort();
   }
 }
 #endif
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
@@ -1100,15 +1100,18 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
     case 2:
       result = Int32EnumPropsNativeComponentMaxInterval::MaxInterval2;
       return;
+    default:
+      abort();
   }
-  abort();
 }
 
 static inline std::string toString(const Int32EnumPropsNativeComponentMaxInterval &value) {
   switch (value) {
     case Int32EnumPropsNativeComponentMaxInterval::MaxInterval0: return \\"0\\";
     case Int32EnumPropsNativeComponentMaxInterval::MaxInterval1: return \\"1\\";
     case Int32EnumPropsNativeComponentMaxInterval::MaxInterval2: return \\"2\\";
+    default:
+      abort();
   }
 }
 
@@ -1118,6 +1121,8 @@ static inline folly::dynamic toDynamic(const Int32EnumPropsNativeComponentMaxInt
     case Int32EnumPropsNativeComponentMaxInterval::MaxInterval0: return 0;
     case Int32EnumPropsNativeComponentMaxInterval::MaxInterval1: return 1;
     case Int32EnumPropsNativeComponentMaxInterval::MaxInterval2: return 2;
+    default:
+      abort();
   }
 }
 #endif
@@ -1399,6 +1404,8 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 static inline std::string toString(const ObjectPropsStringEnumProp &value) {
   switch (value) {
     case ObjectPropsStringEnumProp::Option1: return \\"option1\\";
+    default:
+      abort();
   }
 }
 
@@ -1416,20 +1423,25 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
     case 0:
       result = ObjectPropsIntEnumProp::IntEnumProp0;
       return;
+    default:
+      abort();
   }
-  abort();
 }
 
 static inline std::string toString(const ObjectPropsIntEnumProp &value) {
   switch (value) {
     case ObjectPropsIntEnumProp::IntEnumProp0: return \\"0\\";
+    default:
+      abort();
   }
 }
 
 #ifdef RN_SERIALIZABLE_STATE
 static inline folly::dynamic toDynamic(const ObjectPropsIntEnumProp &value) {
   switch (value) {
     case ObjectPropsIntEnumProp::IntEnumProp0: return 0;
+    default:
+      abort();
   }
 }
 #endif
@@ -1870,6 +1882,8 @@ static inline std::string toString(const StringEnumPropsNativeComponentAlignment
     case StringEnumPropsNativeComponentAlignment::Top: return \\"top\\";
     case StringEnumPropsNativeComponentAlignment::Center: return \\"center\\";
     case StringEnumPropsNativeComponentAlignment::BottomRight: return \\"bottom-right\\";
+    default:
+      abort();
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -421,6 +421,8 @@ static inline std::string toString(const EnumPropNativeComponentViewAlignment &v`
`421`	`421`	`case EnumPropNativeComponentViewAlignment::Top: return \\"top\\";`
`422`	`422`	`case EnumPropNativeComponentViewAlignment::Center: return \\"center\\";`
`423`	`423`	`case EnumPropNativeComponentViewAlignment::BottomRight: return \\"bottom-right\\";`
	`424`	`+ default:`
	`425`	`+ abort();`
`424`	`426`	`}`
`425`	`427`	`}`
`426`	`428`
`@@ -447,8 +449,9 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu`
`447`	`449`	`case 60:`
`448`	`450`	`result = EnumPropNativeComponentViewIntervals::Intervals60;`
`449`	`451`	`return;`
	`452`	`+ default:`
	`453`	`+ abort();`
`450`	`454`	`}`
`451`		`- abort();`
`452`	`455`	`}`
`453`	`456`
`454`	`457`	`static inline std::string toString(const EnumPropNativeComponentViewIntervals &value) {`
`@@ -457,6 +460,8 @@ static inline std::string toString(const EnumPropNativeComponentViewIntervals &v`
`457`	`460`	`case EnumPropNativeComponentViewIntervals::Intervals15: return \\"15\\";`
`458`	`461`	`case EnumPropNativeComponentViewIntervals::Intervals30: return \\"30\\";`
`459`	`462`	`case EnumPropNativeComponentViewIntervals::Intervals60: return \\"60\\";`
	`463`	`+ default:`
	`464`	`+ abort();`
`460`	`465`	`}`
`461`	`466`	`}`
`462`	`467`
`@@ -467,6 +472,8 @@ static inline folly::dynamic toDynamic(const EnumPropNativeComponentViewInterval`
`467`	`472`	`case EnumPropNativeComponentViewIntervals::Intervals15: return 15;`
`468`	`473`	`case EnumPropNativeComponentViewIntervals::Intervals30: return 30;`
`469`	`474`	`case EnumPropNativeComponentViewIntervals::Intervals60: return 60;`
	`475`	`+ default:`
	`476`	`+ abort();`
`470`	`477`	`}`
`471`	`478`	`}`
`472`	`479`	`#endif`
`@@ -926,6 +933,8 @@ static inline std::string toString(const ObjectPropsNativeComponentStringEnumPro`
`926`	`933`	`switch (value) {`
`927`	`934`	`case ObjectPropsNativeComponentStringEnumProp::Small: return \\"small\\";`
`928`	`935`	`case ObjectPropsNativeComponentStringEnumProp::Large: return \\"large\\";`
	`936`	`+ default:`
	`937`	`+ abort();`
`929`	`938`	`}`
`930`	`939`	`}`
`931`	`940`
`@@ -946,14 +955,17 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu`
`946`	`955`	`case 1:`
`947`	`956`	`result = ObjectPropsNativeComponentIntEnumProp::IntEnumProp1;`
`948`	`957`	`return;`
	`958`	`+ default:`
	`959`	`+ abort();`
`949`	`960`	`}`
`950`		`- abort();`
`951`	`961`	`}`
`952`	`962`
`953`	`963`	`static inline std::string toString(const ObjectPropsNativeComponentIntEnumProp &value) {`
`954`	`964`	`switch (value) {`
`955`	`965`	`case ObjectPropsNativeComponentIntEnumProp::IntEnumProp0: return \\"0\\";`
`956`	`966`	`case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return \\"1\\";`
	`967`	`+ default:`
	`968`	`+ abort();`
`957`	`969`	`}`
`958`	`970`	`}`
`959`	`971`
`@@ -962,6 +974,8 @@ static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentIntEnumPr`
`962`	`974`	`switch (value) {`
`963`	`975`	`case ObjectPropsNativeComponentIntEnumProp::IntEnumProp0: return 0;`
`964`	`976`	`case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return 1;`
	`977`	`+ default:`
	`978`	`+ abort();`
`965`	`979`	`}`
`966`	`980`	`}`
`967`	`981`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,8 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu`
`124`	`124`	`static inline std::string toString(const ${enumName} &value) {`
`125`	`125`	`switch (value) {`
`126`	`126`	`${toCases}`
	`127`	`+ default:`
	`128`	`+ abort();`
`127`	`129`	`}`
`128`	`130`	`}`
`129`	`131`
`@@ -154,20 +156,25 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu`
`154`	`156`	`assert(value.hasType<int>());`
`155`	`157`	`auto integerValue = (int)value;`
`156`	`158`	`switch (integerValue) {${fromCases}`
	`159`	`+ default:`
	`160`	`+ abort();`
`157`	`161`	`}`
`158`		`- abort();`
`159`	`162`	`}`
`160`	`163`
`161`	`164`	`static inline std::string toString(const ${enumName} &value) {`
`162`	`165`	`switch (value) {`
`163`	`166`	`${toCases}`
	`167`	`+ default:`
	`168`	`+ abort();`
`164`	`169`	`}`
`165`	`170`	`}`
`166`	`171`
`167`	`172`	`#ifdef RN_SERIALIZABLE_STATE`
`168`	`173`	`static inline folly::dynamic toDynamic(const ${enumName} &value) {`
`169`	`174`	`switch (value) {`
`170`	`175`	`${toDynamicCases}`
	`176`	`+ default:`
	`177`	`+ abort();`
`171`	`178`	`}`
`172`	`179`	`}`
`173`	`180`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1100,15 +1100,18 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu`
`1100`	`1100`	`case 2:`
`1101`	`1101`	`result = Int32EnumPropsNativeComponentMaxInterval::MaxInterval2;`
`1102`	`1102`	`return;`
	`1103`	`+ default:`
	`1104`	`+ abort();`
`1103`	`1105`	`}`
`1104`		`- abort();`
`1105`	`1106`	`}`
`1106`	`1107`
`1107`	`1108`	`static inline std::string toString(const Int32EnumPropsNativeComponentMaxInterval &value) {`
`1108`	`1109`	`switch (value) {`
`1109`	`1110`	`case Int32EnumPropsNativeComponentMaxInterval::MaxInterval0: return \\"0\\";`
`1110`	`1111`	`case Int32EnumPropsNativeComponentMaxInterval::MaxInterval1: return \\"1\\";`
`1111`	`1112`	`case Int32EnumPropsNativeComponentMaxInterval::MaxInterval2: return \\"2\\";`
	`1113`	`+ default:`
	`1114`	`+ abort();`
`1112`	`1115`	`}`
`1113`	`1116`	`}`
`1114`	`1117`
`@@ -1118,6 +1121,8 @@ static inline folly::dynamic toDynamic(const Int32EnumPropsNativeComponentMaxInt`
`1118`	`1121`	`case Int32EnumPropsNativeComponentMaxInterval::MaxInterval0: return 0;`
`1119`	`1122`	`case Int32EnumPropsNativeComponentMaxInterval::MaxInterval1: return 1;`
`1120`	`1123`	`case Int32EnumPropsNativeComponentMaxInterval::MaxInterval2: return 2;`
	`1124`	`+ default:`
	`1125`	`+ abort();`
`1121`	`1126`	`}`
`1122`	`1127`	`}`
`1123`	`1128`	`#endif`
`@@ -1399,6 +1404,8 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu`
`1399`	`1404`	`static inline std::string toString(const ObjectPropsStringEnumProp &value) {`
`1400`	`1405`	`switch (value) {`
`1401`	`1406`	`case ObjectPropsStringEnumProp::Option1: return \\"option1\\";`
	`1407`	`+ default:`
	`1408`	`+ abort();`
`1402`	`1409`	`}`
`1403`	`1410`	`}`
`1404`	`1411`
`@@ -1416,20 +1423,25 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu`
`1416`	`1423`	`case 0:`
`1417`	`1424`	`result = ObjectPropsIntEnumProp::IntEnumProp0;`
`1418`	`1425`	`return;`
	`1426`	`+ default:`
	`1427`	`+ abort();`
`1419`	`1428`	`}`
`1420`		`- abort();`
`1421`	`1429`	`}`
`1422`	`1430`
`1423`	`1431`	`static inline std::string toString(const ObjectPropsIntEnumProp &value) {`
`1424`	`1432`	`switch (value) {`
`1425`	`1433`	`case ObjectPropsIntEnumProp::IntEnumProp0: return \\"0\\";`
	`1434`	`+ default:`
	`1435`	`+ abort();`
`1426`	`1436`	`}`
`1427`	`1437`	`}`
`1428`	`1438`
`1429`	`1439`	`#ifdef RN_SERIALIZABLE_STATE`
`1430`	`1440`	`static inline folly::dynamic toDynamic(const ObjectPropsIntEnumProp &value) {`
`1431`	`1441`	`switch (value) {`
`1432`	`1442`	`case ObjectPropsIntEnumProp::IntEnumProp0: return 0;`
	`1443`	`+ default:`
	`1444`	`+ abort();`
`1433`	`1445`	`}`
`1434`	`1446`	`}`
`1435`	`1447`	`#endif`
`@@ -1870,6 +1882,8 @@ static inline std::string toString(const StringEnumPropsNativeComponentAlignment`
`1870`	`1882`	`case StringEnumPropsNativeComponentAlignment::Top: return \\"top\\";`
`1871`	`1883`	`case StringEnumPropsNativeComponentAlignment::Center: return \\"center\\";`
`1872`	`1884`	`case StringEnumPropsNativeComponentAlignment::BottomRight: return \\"bottom-right\\";`
	`1885`	`+ default:`
	`1886`	`+ abort();`
`1873`	`1887`	`}`
`1874`	`1888`	`}`
`1875`	`1889`