Update atree register inlining 1.0 feature branch #3259
Merged
Conversation
This file contains 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
…nemtn Clear `inAssignment` when recursing into subexpressions
…void storage path conflict
…onflict-handling
Introduce special self-variable
Tool for converting staged contracts migration report from JSON to Markdown
Fix type indexing resource loss
…-stable-cadence
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## feature/atree-register-inlining-v1.0 #3259 +/- ##
=====================================================================
Coverage 80.78% 80.78%
=====================================================================
Files 380 380
Lines 93896 93896
=====================================================================
Hits 75850 75850
Misses 15341 15341
Partials 2705 2705
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:feature/atree-register-inlining-v1.0 commit 8bb9cdb Collapsed results for better readability
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
SupunS
approved these changes
Apr 17, 2024
fxamacker
approved these changes
Apr 17, 2024
turbolent
merged commit 8ad7730
into
feature/atree-register-inlining-v1.0
7 of 9 checks passed
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.
Description
Merge
masterintofeature/atree-register-inlining-v1.0Conflict resolution:
commit 187eda83114cbe733e570af4e95c3bcce22560b7 Merge: 8bb9cdb06 4ada9cb43 Author: Bastian Müller <bastian@turbolent.com> Date: Wed Apr 17 16:08:10 2024 -0700 Merge branch 'master' into bastian/update-atree-register-inlining-v1.0 diff --git a/go.mod b/go.mod remerge CONFLICT (content): Merge conflict in go.mod index 108595e14..9198e1a42 100644 --- a/go.mod +++ b/go.mod @@ -13,11 +13,7 @@ require ( github.com/kr/pretty v0.3.1 github.com/leanovate/gopter v0.2.9 github.com/logrusorgru/aurora/v4 v4.0.0 -<<<<<<< 8bb9cdb06 (Merge pull request #3256 from onflow/bump-atree-version-for-atree-inlining-v1.0) github.com/onflow/atree v0.6.1-0.20240417191405-e11f55fa33a3 -======= - github.com/onflow/atree v0.6.1-0.20240416233652-f4568c0c03df ->>>>>>> 4ada9cb43 (Merge pull request #3254 from onflow/fxamacker/bump-atree-version-for-stable-cadence) github.com/rivo/uniseg v0.4.4 github.com/schollz/progressbar/v3 v3.13.1 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum remerge CONFLICT (content): Merge conflict in go.sum index 3d6c68e0e..9e0381a90 100644 --- a/go.sum +++ b/go.sum @@ -72,13 +72,8 @@ github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvr github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -<<<<<<< 8bb9cdb06 (Merge pull request #3256 from onflow/bump-atree-version-for-atree-inlining-v1.0) github.com/onflow/atree v0.6.1-0.20240417191405-e11f55fa33a3 h1:K8LKxRn1rRdDXLCvYlDNdlQyB28b+fx2doYiIaNGnQU= github.com/onflow/atree v0.6.1-0.20240417191405-e11f55fa33a3/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A= -======= -github.com/onflow/atree v0.6.1-0.20240416233652-f4568c0c03df h1:9dmE37nSKCV1obdPFtUgjKFH2yUHmfSkULX5h35l8yo= -github.com/onflow/atree v0.6.1-0.20240416233652-f4568c0c03df/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= ->>>>>>> 4ada9cb43 (Merge pull request #3254 from onflow/fxamacker/bump-atree-version-for-stable-cadence) github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg= github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= diff --git a/runtime/interpreter/sharedstate.go b/runtime/interpreter/sharedstate.go remerge CONFLICT (content): Merge conflict in runtime/interpreter/sharedstate.go index e3cc63338..61a071f9c 100644 --- a/runtime/interpreter/sharedstate.go +++ b/runtime/interpreter/sharedstate.go @@ -59,13 +59,8 @@ func NewSharedState(config *Config) *SharedState { }, inStorageIteration: false, storageMutatedDuringIteration: false, -<<<<<<< 8bb9cdb06 (Merge pull request #3256 from onflow/bump-atree-version-for-atree-inlining-v1.0) referencedResourceKindedValues: ReferencedResourceKindedValues{}, - resourceVariables: map[ResourceKindedValue]*Variable{}, -======= - referencedResourceKindedValues: map[atree.StorageID]map[*EphemeralReferenceValue]struct{}{}, resourceVariables: map[ResourceKindedValue]Variable{}, ->>>>>>> 4ada9cb43 (Merge pull request #3254 from onflow/fxamacker/bump-atree-version-for-stable-cadence) CapabilityControllerIterations: map[AddressPath]int{}, containerValueIteration: map[atree.ValueID]struct{}{}, destroyedResources: map[atree.ValueID]struct{}{}, diff --git a/runtime/storage.go b/runtime/storage.go index f24f6bf76..4c20eda49 100644 --- a/runtime/storage.go +++ b/runtime/storage.go @@ -356,7 +356,7 @@ func (s *Storage) CheckHealth() error { } type UnreferencedRootSlabsError struct { - UnreferencedRootSlabIDs []atree.StorageID + UnreferencedRootSlabIDs []atree.SlabID } var _ errors.InternalError = UnreferencedRootSlabsError{}masterbranchFiles changedin the Github PR explorer