[Subtyping Generator] Sync feature/subtype-gen branch with master#4339
Merged
Conversation
only convert arguments, do not transfer (avoid unnecessary copies)
Optimize event emission
Optimize subtype check
…sion Cache static-authorization to sema-access conversion results
…/sync-subtype-gen-with-master
Benchstat comparison
Results
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
RZhang05
approved these changes
Nov 14, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Sync with master to get the #4336 changes to the feature branch.
Conflicts:
Merge: cc0eee2de 589f8271c Author: Supun Setunga <supun.setunga@gmail.com> Date: Thu Nov 13 21:57:37 2025 -0800 Merge branch 'master' of https://github.com/onflow/cadence into supun/sync-subtype-gen-with-master diff --git a/sema/type.go b/sema/type.go remerge CONFLICT (content): Merge conflict in sema/type.go index 174687738..382da51c3 100644 --- a/sema/type.go +++ b/sema/type.go @@ -7985,33 +7985,11 @@ func checkSubTypeWithoutEquality(subType Type, superType Type) bool { if subTypeBaseType := typedSubType.BaseType(); subTypeBaseType != nil { -<<<<<<< cc0eee2de (Merge pull request #4330 from onflow/supun/sync-subtype-gen-with-master) if !IsSubType(subTypeBaseType, superTypeBaseType) { return false } return AreTypeArgumentsEqual(typedSubType, typedSuperType) -======= - if !IsSubType(subTypeBaseType, superTypeBaseType) { - return false ->>>>>>> 589f8271c (Merge pull request #4336 from onflow/supun/cache-authorization-conversion) - } - - subTypeTypeArguments := typedSubType.TypeArguments() - superTypeTypeArguments := typedSuperType.TypeArguments() - - if len(subTypeTypeArguments) != len(superTypeTypeArguments) { - return false - } - - for i, superTypeTypeArgument := range superTypeTypeArguments { - subTypeTypeArgument := subTypeTypeArguments[i] - if !IsSubType(subTypeTypeArgument, superTypeTypeArgument) { - return false - } - } - - return true } } else { // TODO: enforce type arguments, remove this rule @@ -8026,15 +8004,9 @@ func checkSubTypeWithoutEquality(subType Type, superType Type) bool { return false -<<<<<<< cc0eee2de (Merge pull request #4330 from onflow/supun/sync-subtype-gen-with-master) - // T<Us> <: V - // if T <: V - return IsParameterizedSubType(subType, superType) -======= } return false ->>>>>>> 589f8271c (Merge pull request #4336 from onflow/supun/cache-authorization-conversion) } // UnwrapOptionalType returns the type if it is not an optional type,masterbranchFiles changedin the Github PR explorer