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.

Sign up for GitHub

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

Jump to bottom

Improve errors #2356

Merged
merged 4 commits into from
Feb 28, 2023
Merged

Improve errors #2356

merged 4 commits into from
Feb 28, 2023

Conversation

turbolent
Copy link
Member

Description

  • Add type assertions for error types with SecondaryError function
  • Optimize NotDeclaredMemberError.findClosestMember by avoiding allocation
  • 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

@turbolent turbolent self-assigned this Feb 28, 2023
@github-actions
Copy link

github-actions bot commented Feb 28, 2023 •
edited
Loading

Cadence Benchstat comparison

This branch with compared with the base branch onflow:master commit bd4d65b
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-2108µs ± 0%108µs ± 0%~(p=1.000 n=1+1)
ContractInterfaceFungibleToken-237.3µs ± 0%43.1µs ± 0%~(p=1.000 n=1+1)
ExportType/composite_type-2465ns ± 0%477ns ± 0%~(p=1.000 n=1+1)
ExportType/simple_type-257.8ns ± 0%67.0ns ± 0%~(p=1.000 n=1+1)
InterpretRecursionFib-22.50ms ± 0%2.45ms ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_interpreter-21.09µs ± 0%1.09µs ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_sub-interpreter-2594ns ± 0%576ns ± 0%~(p=1.000 n=1+1)
ParseArray-27.56ms ± 0%7.63ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-211.5ms ± 0%11.5ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-21.19ms ± 0%1.19ms ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-2186µs ± 0%193µs ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-2142µs ± 0%143µs ± 0%~(p=1.000 n=1+1)
ParseInfix-27.02µs ± 0%7.03µs ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-22.42ns ± 0%2.42ns ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/Three_levels-2119ns ± 0%117ns ± 0%~(p=1.000 n=1+1)
RuntimeResourceDictionaryValues-25.12ms ± 0%5.10ms ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-24.21µs ± 0%7.04µs ± 0%~(p=1.000 n=1+1)
SuperTypeInference/arrays-2290ns ± 0%289ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/composites-2129ns ± 0%129ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/integers-293.2ns ± 0%93.5ns ± 0%~(p=1.000 n=1+1)
ValueIsSubtypeOfSemaType-293.0ns ± 0%89.9ns ± 0%~(p=1.000 n=1+1)
 
alloc/opdelta
CheckContractInterfaceFungibleTokenConformance-249.3kB ± 0%49.3kB ± 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%~(all equal)
NewInterpreter/new_interpreter-2768B ± 0%768B ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-2200B ± 0%200B ± 0%~(all equal)
ParseArray-22.72MB ± 0%2.79MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-24.25MB ± 0%4.26MB ± 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.7kB ± 0%28.7kB ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-228.7kB ± 0%28.7kB ± 0%~(p=1.000 n=1+1)
ParseInfix-21.92kB ± 0%1.92kB ± 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.28MB ± 0%2.28MB ± 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 Feb 28, 2023 •
edited
Loading

Codecov Report

Merging #2356 (dc587a5) into master (bd4d65b) will increase coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head dc587a5 differs from pull request most recent head b5f57e9. Consider uploading reports for the commit b5f57e9 to get more accurate results

@@           Coverage Diff           @@
##           master    #2356   +/-   ##
=======================================
  Coverage   78.21%   78.21%           
=======================================
  Files         312      312           
  Lines       66973    66980    +7     
=======================================
+ Hits        52383    52390    +7     
  Misses      12819    12819           
  Partials     1771     1771
Flag Coverage Δ
unittests 78.21% <100.00%> (+<0.01%) ⬆️

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

Impacted Files Coverage Δ
runtime/interpreter/errors.go 59.92% <ø> (ø)
runtime/parser/errors.go 28.04% <ø> (ø)
runtime/sema/errors.go 92.78% <100.00%> (+0.04%) ⬆️

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

@turbolent turbolent enabled auto-merge February 28, 2023 20:10
@turbolent turbolent merged commit 60a7a95 into master Feb 28, 2023
@turbolent turbolent deleted the bastian/improve-errors branch March 8, 2023 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SupunS SupunS SupunS approved these changes

@dsainati1 dsainati1 dsainati1 approved these changes

Assignees

@turbolent turbolent

Labels
Improvement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@turbolent @dsainati1 @SupunS