Avoid HasFlag in hot-path when targeting netfx (#8779)

flobernd · flobernd · commit 4c69a0f37105 · 2025-11-24T14:05:19.000Z
(cherry picked from commit 1e8ef0b)
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/DoubleWithFractionalPortionConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/DoubleWithFractionalPortionConverter.cs
@@ -39,7 +39,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
 			return reader.GetDouble();
 		}
 
+#if !NETFRAMEWORK
 		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
+#else
+		// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
+		if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==
+		    (int)JsonNumberHandling.AllowNamedFloatingPointLiterals)
+#endif
 		{
 			if (reader.ValueTextEquals(NaN))
 			{
@@ -57,7 +63,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
 			}
 		}
 
+#if !NETFRAMEWORK
 		if (!options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))
+#else
+		// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
+		if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowReadingFromString) !=
+		    (int)JsonNumberHandling.AllowReadingFromString)
+#endif
 		{
 			return reader.GetDouble();
 		}
@@ -71,7 +83,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
 
 	public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOptions options)
 	{
+#if !NETFRAMEWORK
 		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
+#else
+		// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
+		if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==
+		    (int)JsonNumberHandling.AllowNamedFloatingPointLiterals)
+#endif
 		{
 			if (double.IsNaN(value))
 			{
@@ -92,7 +110,13 @@ public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOp
 			}
 		}
 
+#if !NETFRAMEWORK
 		if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))
+#else
+		// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
+		if (((int)options.NumberHandling & (int)JsonNumberHandling.WriteAsString) ==
+		    (int)JsonNumberHandling.WriteAsString)
+#endif
 		{
 			throw new NotImplementedException("'JsonNumberHandling.WriteAsString' is currently not supported.");
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleWithFractionalPortionConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleWithFractionalPortionConverter.cs
@@ -39,7 +39,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
 			return reader.GetSingle();
 		}
 
+#if !NETFRAMEWORK
 		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
+#else
+		// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
+		if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==
+		    (int)JsonNumberHandling.AllowNamedFloatingPointLiterals)
+#endif
 		{
 			if (reader.ValueTextEquals(NaN))
 			{
@@ -57,7 +63,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
 			}
 		}
 
+#if !NETFRAMEWORK
 		if (!options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))
+#else
+		// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
+		if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowReadingFromString) !=
+		    (int)JsonNumberHandling.AllowReadingFromString)
+#endif
 		{
 			return reader.GetSingle();
 		}
@@ -71,7 +83,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
 
 	public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOptions options)
 	{
+#if !NETFRAMEWORK
 		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
+#else
+		// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
+		if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==
+		    (int)JsonNumberHandling.AllowNamedFloatingPointLiterals)
+#endif
 		{
 			if (float.IsNaN(value))
 			{
@@ -92,7 +110,13 @@ public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOpt
 			}
 		}
 
+#if !NETFRAMEWORK
 		if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))
+#else
+		// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
+		if (((int)options.NumberHandling & (int)JsonNumberHandling.WriteAsString) ==
+		    (int)JsonNumberHandling.WriteAsString)
+#endif
 		{
 			throw new NotImplementedException("'JsonNumberHandling.WriteAsString' is currently not supported.");
 		}

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS`
`39`	`39`	`return reader.GetDouble();`
`40`	`40`	`}`
`41`	`41`
	`42`	`+#if !NETFRAMEWORK`
`42`	`43`	`if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))`
	`44`	`+#else`
	`45`	+ // Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
	`46`	`+ if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==`
	`47`	`+ (int)JsonNumberHandling.AllowNamedFloatingPointLiterals)`
	`48`	`+#endif`
`43`	`49`	`{`
`44`	`50`	`if (reader.ValueTextEquals(NaN))`
`45`	`51`	`{`
`@@ -57,7 +63,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS`
`57`	`63`	`}`
`58`	`64`	`}`
`59`	`65`
	`66`	`+#if !NETFRAMEWORK`
`60`	`67`	`if (!options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))`
	`68`	`+#else`
	`69`	+ // Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
	`70`	`+ if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowReadingFromString) !=`
	`71`	`+ (int)JsonNumberHandling.AllowReadingFromString)`
	`72`	`+#endif`
`61`	`73`	`{`
`62`	`74`	`return reader.GetDouble();`
`63`	`75`	`}`
`@@ -71,7 +83,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS`
`71`	`83`
`72`	`84`	`public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOptions options)`
`73`	`85`	`{`
	`86`	`+#if !NETFRAMEWORK`
`74`	`87`	`if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))`
	`88`	`+#else`
	`89`	+ // Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
	`90`	`+ if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==`
	`91`	`+ (int)JsonNumberHandling.AllowNamedFloatingPointLiterals)`
	`92`	`+#endif`
`75`	`93`	`{`
`76`	`94`	`if (double.IsNaN(value))`
`77`	`95`	`{`
`@@ -92,7 +110,13 @@ public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOp`
`92`	`110`	`}`
`93`	`111`	`}`
`94`	`112`
	`113`	`+#if !NETFRAMEWORK`
`95`	`114`	`if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))`
	`115`	`+#else`
	`116`	+ // Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
	`117`	`+ if (((int)options.NumberHandling & (int)JsonNumberHandling.WriteAsString) ==`
	`118`	`+ (int)JsonNumberHandling.WriteAsString)`
	`119`	`+#endif`
`96`	`120`	`{`
`97`	`121`	`throw new NotImplementedException("'JsonNumberHandling.WriteAsString' is currently not supported.");`
`98`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe`
`39`	`39`	`return reader.GetSingle();`
`40`	`40`	`}`
`41`	`41`
	`42`	`+#if !NETFRAMEWORK`
`42`	`43`	`if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))`
	`44`	`+#else`
	`45`	+ // Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
	`46`	`+ if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==`
	`47`	`+ (int)JsonNumberHandling.AllowNamedFloatingPointLiterals)`
	`48`	`+#endif`
`43`	`49`	`{`
`44`	`50`	`if (reader.ValueTextEquals(NaN))`
`45`	`51`	`{`
`@@ -57,7 +63,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe`
`57`	`63`	`}`
`58`	`64`	`}`
`59`	`65`
	`66`	`+#if !NETFRAMEWORK`
`60`	`67`	`if (!options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))`
	`68`	`+#else`
	`69`	+ // Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
	`70`	`+ if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowReadingFromString) !=`
	`71`	`+ (int)JsonNumberHandling.AllowReadingFromString)`
	`72`	`+#endif`
`61`	`73`	`{`
`62`	`74`	`return reader.GetSingle();`
`63`	`75`	`}`
`@@ -71,7 +83,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe`
`71`	`83`
`72`	`84`	`public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOptions options)`
`73`	`85`	`{`
	`86`	`+#if !NETFRAMEWORK`
`74`	`87`	`if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))`
	`88`	`+#else`
	`89`	+ // Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
	`90`	`+ if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==`
	`91`	`+ (int)JsonNumberHandling.AllowNamedFloatingPointLiterals)`
	`92`	`+#endif`
`75`	`93`	`{`
`76`	`94`	`if (float.IsNaN(value))`
`77`	`95`	`{`
`@@ -92,7 +110,13 @@ public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOpt`
`92`	`110`	`}`
`93`	`111`	`}`
`94`	`112`
	`113`	`+#if !NETFRAMEWORK`
`95`	`114`	`if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))`
	`115`	`+#else`
	`116`	+ // Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
	`117`	`+ if (((int)options.NumberHandling & (int)JsonNumberHandling.WriteAsString) ==`
	`118`	`+ (int)JsonNumberHandling.WriteAsString)`
	`119`	`+#endif`
`96`	`120`	`{`
`97`	`121`	`throw new NotImplementedException("'JsonNumberHandling.WriteAsString' is currently not supported.");`
`98`	`122`	`}`