Merge pull request #78009 from 2horse9sun/fix-JSONSerialization-ScalarBitSetTraits-map-enum

DougGregor · web-flow · commit bfae734022fc · 2024-12-11T09:37:48.000-08:00
Fix compile error caused by customized mapping of enums during JSONSerialization
diff --git a/include/swift/Basic/JSONSerialization.h b/include/swift/Basic/JSONSerialization.h
@@ -443,21 +443,21 @@ class Output {
   template <typename T>
   void bitSetCase(T &Val, const char* Str, const T ConstVal) {
     if (bitSetMatch(Str, (Val & ConstVal) == ConstVal)) {
-      Val = Val | ConstVal;
+      Val = static_cast<T>(Val | ConstVal);
     }
   }
 
   template <typename T>
   void maskedBitSetCase(T &Val, const char *Str, T ConstVal, T Mask) {
     if (bitSetMatch(Str, (Val & Mask) == ConstVal))
-      Val = Val | ConstVal;
+      Val = static_cast<T>(Val | ConstVal);
   }
 
   template <typename T>
   void maskedBitSetCase(T &Val, const char *Str, uint32_t ConstVal,
                         uint32_t Mask) {
     if (bitSetMatch(Str, (Val & Mask) == ConstVal))
-      Val = Val | ConstVal;
+      Val = static_cast<T>(Val | ConstVal);
   }
 
   template <typename T>

Original file line number	Diff line number	Diff line change
`@@ -443,21 +443,21 @@ class Output {`
`443`	`443`	`template <typename T>`
`444`	`444`	`void bitSetCase(T &Val, const char* Str, const T ConstVal) {`
`445`	`445`	`if (bitSetMatch(Str, (Val & ConstVal) == ConstVal)) {`
`446`		`- Val = Val \| ConstVal;`
	`446`	`+ Val = static_cast<T>(Val \| ConstVal);`
`447`	`447`	`}`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`template <typename T>`
`451`	`451`	`void maskedBitSetCase(T &Val, const char *Str, T ConstVal, T Mask) {`
`452`	`452`	`if (bitSetMatch(Str, (Val & Mask) == ConstVal))`
`453`		`- Val = Val \| ConstVal;`
	`453`	`+ Val = static_cast<T>(Val \| ConstVal);`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`template <typename T>`
`457`	`457`	`void maskedBitSetCase(T &Val, const char *Str, uint32_t ConstVal,`
`458`	`458`	`uint32_t Mask) {`
`459`	`459`	`if (bitSetMatch(Str, (Val & Mask) == ConstVal))`
`460`		`- Val = Val \| ConstVal;`
	`460`	`+ Val = static_cast<T>(Val \| ConstVal);`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`template <typename T>`