Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add position information to rewritten post condition before statement #2373

Merged
merged 1 commit into from
Mar 6, 2023

Conversation

turbolent
Copy link
Member

Fixes #2361

Description

Post conditions with before expressions are rewritten into statements.

Add correct position information to these statements, as both code coverage and debugger rely on it.

cc @m-Peter @bluesign


  • Targeted PR against master branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work
  • Code follows the standards mentioned here
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

@github-actions
Copy link

github-actions bot commented Mar 6, 2023

Cadence Benchstat comparison

This branch with compared with the base branch onflow:master commit b9f8a25
The command for i in {1..N}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done was used.
Bench tests were run a total of 7 times on each branch.

Collapsed results for better readability

old.txtnew.txt
time/opdelta
CheckContractInterfaceFungibleTokenConformance-2135µs ± 0%136µs ± 0%~(p=1.000 n=1+1)
ContractInterfaceFungibleToken-245.1µs ± 0%45.3µs ± 0%~(p=1.000 n=1+1)
ExportType/composite_type-2414ns ± 0%600ns ± 0%~(p=1.000 n=1+1)
ExportType/simple_type-262.9ns ± 0%67.5ns ± 0%~(p=1.000 n=1+1)
InterpretRecursionFib-22.67ms ± 0%2.66ms ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_interpreter-21.33µs ± 0%1.33µs ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_sub-interpreter-2712ns ± 0%719ns ± 0%~(p=1.000 n=1+1)
ParseArray-29.64ms ± 0%9.52ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-214.7ms ± 0%14.3ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-21.45ms ± 0%1.53ms ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-2226µs ± 0%228µs ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-2175µs ± 0%176µs ± 0%~(p=1.000 n=1+1)
ParseInfix-28.20µs ± 0%8.14µs ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-22.81ns ± 0%2.81ns ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/Three_levels-2164ns ± 0%158ns ± 0%~(p=1.000 n=1+1)
RuntimeResourceDictionaryValues-26.06ms ± 0%6.10ms ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-24.53µs ± 0%4.44µs ± 0%~(p=1.000 n=1+1)
SuperTypeInference/arrays-2389ns ± 0%383ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/composites-2161ns ± 0%161ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/integers-2108ns ± 0%117ns ± 0%~(p=1.000 n=1+1)
ValueIsSubtypeOfSemaType-2116ns ± 0%112ns ± 0%~(p=1.000 n=1+1)
 
alloc/opdelta
CheckContractInterfaceFungibleTokenConformance-248.9kB ± 0%48.9kB ± 0%~(all equal)
ContractInterfaceFungibleToken-223.2kB ± 0%23.2kB ± 0%~(all equal)
ExportType/composite_type-2136B ± 0%136B ± 0%~(all equal)
ExportType/simple_type-20.00B 0.00B ~(all equal)
InterpretRecursionFib-21.00MB ± 0%1.00MB ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_interpreter-2768B ± 0%768B ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-2200B ± 0%200B ± 0%~(all equal)
ParseArray-22.74MB ± 0%2.74MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-24.33MB ± 0%4.09MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-2214kB ± 0%214kB ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-228.9kB ± 0%28.9kB ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-228.9kB ± 0%28.9kB ± 0%~(p=1.000 n=1+1)
ParseInfix-21.91kB ± 0%1.91kB ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-20.00B 0.00B ~(all equal)
QualifiedIdentifierCreation/Three_levels-264.0B ± 0%64.0B ± 0%~(all equal)
RuntimeResourceDictionaryValues-22.29MB ± 0%2.29MB ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-22.70kB ± 0%2.70kB ± 0%~(all equal)
SuperTypeInference/arrays-296.0B ± 0%96.0B ± 0%~(all equal)
SuperTypeInference/composites-20.00B 0.00B ~(all equal)
SuperTypeInference/integers-20.00B 0.00B ~(all equal)
ValueIsSubtypeOfSemaType-248.0B ± 0%48.0B ± 0%~(all equal)
 
allocs/opdelta
CheckContractInterfaceFungibleTokenConformance-2806 ± 0%806 ± 0%~(all equal)
ContractInterfaceFungibleToken-2370 ± 0%370 ± 0%~(all equal)
ExportType/composite_type-23.00 ± 0%3.00 ± 0%~(all equal)
ExportType/simple_type-20.00 0.00 ~(all equal)
InterpretRecursionFib-218.9k ± 0%18.9k ± 0%~(all equal)
NewInterpreter/new_interpreter-213.0 ± 0%13.0 ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-24.00 ± 0%4.00 ± 0%~(all equal)
ParseArray-259.6k ± 0%59.6k ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-289.4k ± 0%89.4k ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-263.0 ± 0%63.0 ± 0%~(all equal)
ParseFungibleToken/With_memory_metering-2768 ± 0%768 ± 0%~(all equal)
ParseFungibleToken/Without_memory_metering-2768 ± 0%768 ± 0%~(all equal)
ParseInfix-248.0 ± 0%48.0 ± 0%~(all equal)
QualifiedIdentifierCreation/One_level-20.00 0.00 ~(all equal)
QualifiedIdentifierCreation/Three_levels-22.00 ± 0%2.00 ± 0%~(all equal)
RuntimeResourceDictionaryValues-236.9k ± 0%36.9k ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-243.0 ± 0%43.0 ± 0%~(all equal)
SuperTypeInference/arrays-23.00 ± 0%3.00 ± 0%~(all equal)
SuperTypeInference/composites-20.00 0.00 ~(all equal)
SuperTypeInference/integers-20.00 0.00 ~(all equal)
ValueIsSubtypeOfSemaType-21.00 ± 0%1.00 ± 0%~(all equal)
 

@codecov
Copy link

codecov bot commented Mar 6, 2023

Codecov Report

Merging #2373 (dd7d956) into master (9834f0e) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #2373   +/-   ##
=======================================
  Coverage   78.50%   78.50%           
=======================================
  Files         316      316           
  Lines       68442    68463   +21     
=======================================
+ Hits        53728    53749   +21     
  Misses      12916    12916           
  Partials     1798     1798           
Flag Coverage Δ
unittests 78.50% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
runtime/sema/checker.go 92.62% <100.00%> (+0.01%) ⬆️
runtime/coverage.go 100.00% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@turbolent turbolent merged commit 5b2e90e into master Mar 6, 2023
@turbolent turbolent deleted the bastian/fix-before-statement-position branch March 6, 2023 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Code coverage report for an address that contains only a contract interface
3 participants