Make parameter matching for custom properties map property Name with parameter #16
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
||
| foreach (KeyValuePair<string, JsonPropertyInfo?> kvp in PropertyCache.List) | ||
| { | ||
| JsonPropertyInfo jsonProperty = kvp.Value!; |
Collaborator
There was a problem hiding this comment.
Should we replace this bang with an assert as well?
Owner
Author
There was a problem hiding this comment.
this one is ok because we never actually insert nulls there, it's just weird implementation detail of PropertyCache.List
| if (hasJsonInclude) | ||
| { | ||
| ThrowHelper.ThrowInvalidOperationException_JsonIncludeOnNonPublicInvalid(jsonPropertyInfo.ClrName!, jsonPropertyInfo.DeclaringType); | ||
| Debug.Assert(jsonPropertyInfo.ClrName != null, "ClrName is not set by source gen"); |
Collaborator
There was a problem hiding this comment.
Suggested change
| Debug.Assert(jsonPropertyInfo.ClrName != null, "ClrName is not set by source gen"); | |
| Debug.Assert(jsonPropertyInfo.ClrName != null, "ClrName is always set by source gen"); |
Collaborator
There was a problem hiding this comment.
Actually nevermind, depends on whether the string reflects the assertion or the failure condition.
Owner
Author
There was a problem hiding this comment.
yeh, it's more like error message so says exactly opposite😄
eiriktsarpalis
approved these changes
Jun 22, 2022
krwq
added a commit
that referenced
this pull request
Jun 27, 2022
* Initial implementation for contract customization fix build errors Move converter rooting to DefaultJsonTypeInfoResolver so that it can be used standalone Fix ConfigurationList.IsReadOnly Minor refactorings (#1) * Makes the following changes: * Move singleton initialization for DefaultTypeInfoResolver behind a static property. * Consolidate JsonSerializerContext & IJsonTypeInfoResolver values to a single field. * Move reflection fallback logic away from JsonSerializerContext and into JsonSerializerOptions * Update src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.cs * remove testing of removed field Simplify the JsonTypeInfo.CreateObject implemenetation (#2) * Simplify the JsonTypeInfo.CreateObject implemenetation * Update src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfoOfT.cs * Update src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfoOfT.cs Co-authored-by: Krzysztof Wicher <[email protected]> Co-authored-by: Krzysztof Wicher <[email protected]> Tests and fixes for JsonTypeInfoKind.None TypeInfo type mismatch tests Allow setting NumberHandling on JsonTypeInfoKind.None test resolver returning wrong type of options JsonTypeInfo/JsonPropertyInfo mutability tests rename test file Move default converter rooting responsibility behind DefaultJsonTypeInfoResolver (#3) * Move default converter rooting responsibility behind DefaultJsonTypeInfoResolver * address feedback Add simple test for using JsonTypeInfo<T> with APIs directly taking it fix and tests for untyped/typed CreateObject uncomment test cases, remove todo More tests and tiny fixes Add a JsonTypeInfoResolver.Combine test for JsonSerializerContext (#4) * Fix JsonTypeInfoResolver.Combine for JsonSerializerContext * Break up failing test Fix simple scenarios for combining contexts (#6) * Fix simple scenarios for combining contexts * feedback JsonSerializerContext combine test with different camel casing Remove unneeded virtual calls & branching when accessing Get & Set delegates (#7) JsonPropertyInfo tests everything minus ShouldSerialize & NumberHandling Update src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonConverterOfT.cs Update src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonConverterOfT.cs throw InvalidOperationException rather than ArgumentNullException for source gen when PropertyInfo.Name is assigned through JsonPropertyInfoValues tests for duplicated property names and JsonPropertyInfo.NumberHandling Add tests for NumberHandling and failing tests for ShouldSerialize disable the failing test and add extra checks disable remainder of the failing ShouldSerialize tests, fix working one Fix ShouldSerialize and IgnoreCondition interop Add failing tests for CreateObject + parametrized constructors Fix CreateObject support for JsonConstructor types (#10) * Fix CreateObject support for JsonConstructor types * address feedback Make contexts more combinator friendly (#9) * Make contexts more combinator friendly * remove converter cache * redesign test to account for JsonConstructorAttribute * Combine unit tests * address feedback * Add acceptance tests for DataContract attributes & Specified pattern (#11) * Add private field serialization acceptance test (#13) * tests, PR feedback (#14) * PR feedback and extra tests * Shorten class name, remove incorrect check (not true for polimorphic cases) * Make parameter matching for custom properties map property Name with parameter (#16) * Test static initialization with JsonTypeInfo (#17) * Fix test failures and proper fix this time (#18) * Fix test failures and proper fix this time * reinstate ActiveIssueAttribute * PR feedback and adjust couple of tests which don't set TypeInfoResolver * fix IAsyncEnumerable tests * Lock JsonSerializerOptions in JsonTypeInfo.EnsureConfigured() Co-authored-by: Eirik Tsarpalis <[email protected]> Co-authored-by: Eirik Tsarpalis <[email protected]>
krwq
pushed a commit
that referenced
this pull request
Oct 10, 2022
…6616) * Support Arm64 "constructed" constants in SuperPMI asm diffs SuperPMI asm diffs tries to ignore constants that can change between multiple replays, such as addresses that the replay engine must generate and not simply hand back from the collected data. Often, addresses have associated relocations generated during replay. SuperPMI can use these relocations to adjust the constants to allow two replays to match. However, there are cases on Arm64 where an address both doesn't report a relocation and is "constructed" using multiple `mov`/`movk` instructions. One case is the `allocPgoInstrumentationBySchema()` API which returns a pointer to a PGO data buffer. An address within this buffer is constructed via a sequence such as: ``` mov x0, dotnet#63408 movk x0, dotnet#23602, lsl #16 movk x0, dotnet#606, lsl dotnet#32 ``` When SuperPMI replays this API, it constructs a new buffer and returns that pointer, which is used to construct various actual addresses that are generated as "constructed" constants, shown above. This change "de-constructs" the constants and looks them up in the replay address map. If base and diff match the mapped constants, there is no asm diff. * Fix 32-bit build I don't think we fully support 64-bit replay on 32-bit host, but this fix at least makes it possible for this case. * Support more general mov/movk sequence Allow JIT1 and JIT2 to have a different sequence of mov/movk[/movk[/movk]] that map to the same address in the address map. That is, the replay constant might require a different set of instructions (e.g., if a `movk` is missing because its constant is zero).
krwq
pushed a commit
that referenced
this pull request
Mar 21, 2025
* JIT: Introduce `LclVarDsc::lvIsMultiRegDest`
With recent work to expand returned promoted locals into `FIELD_LIST`
the only "whole references" of promoted locals we should see is when
stored from a multi-reg node. This is the only knowledge the backend
should need for correctness purposes, so introduce a bit to track this
property, and switch the backend to check this instead.
The existing `lvIsMultiRegRet` is essentially this + whether the local
is returned. We should be able to remove this, but it is currently used
for some heuristics in old promotion, so keep it around for now.
* JIT: Add some more constant folding in lowering
Add folding for shifts and certain binops that are now getting produced
late due to returned `FIELD_LIST` nodes.
win-arm64 example:
```csharp
[MethodImpl(MethodImplOptions.NoInlining)]
static ValueTask<byte> Foo()
{
return new ValueTask<byte>(123);
}
```
```diff
G_M17084_IG02: ;; offset=0x0008
mov x0, xzr
- mov w1, #1
- mov w2, wzr
- mov w3, dotnet#123
- orr w2, w2, w3, LSL #16
- orr w1, w2, w1, LSL dotnet#24
- ;; size=24 bbWeight=1 PerfScore 4.00
+ mov w1, #0x17B0000
+ ;; size=8 bbWeight=1 PerfScore 1.00
```
* Feedback
krwq
pushed a commit
that referenced
this pull request
Jun 9, 2025
Add support using bitwise operations to reconstruct registers passed
into calls from multiple promoted fields. Remove the IR invariant that
`FIELD_LIST` args must always map cleanly to registers; instead, any
`FIELD_LIST` is allowed for register-only arguments before lowering, and
lowering takes care to normalize them into a handled shape.
`fgTryMorphStructArg` is changed to take advantage of this by now
producing `FIELD_LIST` even when a promoted arg does not match the
target ABI. Support in physical promotion will be added in a follow up.
Split arguments are not handled and retain the old IR invariant of
requiring registers and stack slots to make cleanly from `FIELD_LIST`.
win-x64 examples:
```csharp
static void Foo(int x)
{
Use<int?>(x);
Use<int?>(5);
Use<int?>(null);
}
```
```diff
G_M7200_IG02: ;; offset=0x0004
- mov byte ptr [rsp+0x20], 1
- mov dword ptr [rsp+0x24], ecx
- mov rcx, qword ptr [rsp+0x20]
+ mov ecx, ecx
+ shl rcx, 32
+ or rcx, 1
call [Program:Bar(System.Nullable`1[int])]
- mov dword ptr [rsp+0x24], 5
- mov rcx, qword ptr [rsp+0x20]
+ mov rcx, 0x500000001
call [Program:Bar(System.Nullable`1[int])]
- mov byte ptr [rsp+0x20], 0
xor ecx, ecx
- mov dword ptr [rsp+0x24], ecx
- mov rcx, qword ptr [rsp+0x20]
- ;; size=55 bbWeight=1 PerfScore 14.25
+ ;; size=34 bbWeight=1 PerfScore 7.50
G_M7200_IG03:
add rsp, 40
tail.jmp [Program:Bar(System.Nullable`1[int])]
;; size=10 bbWeight=1 PerfScore 2.25
```
```csharp
static void Foo(int x, float y)
{
Use((x, y));
}
```
```diff
G_M42652_IG01: ;; offset=0x0000
- push rax
- ;; size=1 bbWeight=1 PerfScore 1.00
+ ;; size=0 bbWeight=1 PerfScore 0.00
G_M42652_IG02:
- mov dword ptr [rsp], ecx
- vmovss dword ptr [rsp+0x04], xmm1
- mov rcx, qword ptr [rsp]
+ vmovd eax, xmm1
+ shl rax, 32
+ mov ecx, ecx
+ or rcx, rax
;; size=13 bbWeight=1 PerfScore 3.00
G_M42652_IG03:
- add rsp, 8
tail.jmp [Program:Use[System.ValueTuple`2[int,float]](System.ValueTuple`2[int,float])]
```
A win-arm64 example:
```csharp
static void Foo(int[] arr)
{
Use(arr.AsMemory());
}
```
```diff
G_M33990_IG01:
- stp fp, lr, [sp, #-0x20]!
+ stp fp, lr, [sp, #-0x10]!
mov fp, sp
- str xzr, [fp, #0x10] // [V03 tmp2]
- ;; size=12 bbWeight=1 PerfScore 2.50
+ ;; size=8 bbWeight=1 PerfScore 1.50
G_M33990_IG02:
cbz x0, G_M33990_IG04
;; size=4 bbWeight=1 PerfScore 1.00
G_M33990_IG03:
- str x0, [fp, #0x10] // [V07 tmp6]
- str wzr, [fp, #0x18] // [V08 tmp7]
- ldr w0, [x0, #0x08]
- str w0, [fp, #0x1C] // [V09 tmp8]
+ ldr w1, [x0, #0x08]
b G_M33990_IG05
- ;; size=20 bbWeight=0.50 PerfScore 3.50
+ ;; size=8 bbWeight=0.50 PerfScore 2.00
G_M33990_IG04:
- str xzr, [fp, #0x10] // [V07 tmp6]
- str xzr, [fp, #0x18]
- ;; size=8 bbWeight=0.50 PerfScore 1.00
+ mov x0, xzr
+ mov w1, wzr
+ ;; size=8 bbWeight=0.50 PerfScore 0.50
G_M33990_IG05:
- ldp x0, x1, [fp, #0x10] // [V03 tmp2], [V03 tmp2+0x08]
- movz x2, #0xD920 // code for Program:Use[System.Memory`1[int]](System.Memory`1[int])
- movk x2, #0x4590 LSL #16
+ mov w1, w1
+ lsl x1, x1, dotnet#32
+ movz x2, #0xD950 // code for Program:Use[System.Memory`1[int]](System.Memory`1[int])
+ movk x2, #0x4592 LSL #16
movk x2, #0x7FFE LSL dotnet#32
ldr x2, [x2]
- ;; size=20 bbWeight=1 PerfScore 7.50
+ ;; size=24 bbWeight=1 PerfScore 6.00
G_M33990_IG06:
- ldp fp, lr, [sp], #0x20
+ ldp fp, lr, [sp], #0x10
br x2
;; size=8 bbWeight=1 PerfScore 2.00
-; Total bytes of code: 72
+; Total bytes of code: 60
```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…parameter