fix: call internal functions from constructor #2496
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
Codecov Report
@@ Coverage Diff @@
## master #2496 +/- ##
===========================================
- Coverage 87.37% 71.00% -16.38%
===========================================
Files 94 94
Lines 10054 10115 +61
Branches 2490 2443 -47
===========================================
- Hits 8785 7182 -1603
- Misses 802 2260 +1458
- Partials 467 673 +206
Continue to review full report at Codecov.
|
charles-cooper
force-pushed
the
feat/ctor_internal_funcs
branch
from
2980cf1
to
ca57d81
Compare
charles-cooper
force-pushed
the
feat/ctor_internal_funcs
branch
2 times, most recently
from
f043608
to
0cf738b
Compare
charles-cooper
force-pushed
the
feat/ctor_internal_funcs
branch
from
0cf738b
to
fa85fbf
Compare
this commit allows the user to call internal functions from the `__init__` function. it does this by tracing all the internal functions called from every function's execution (during the annotation phase), and then generating code for the functions called from the init function for during deploy code generation this also has a performance benefit (compiler time) because we can get rid of the two-pass method for tracing frame size. also, this opens the door to topsort of internal functions, if desired (so that the user does not have to order them manually).
charles-cooper
force-pushed
the
feat/ctor_internal_funcs
branch
from
dcdb2a6
to
f85b6de
Compare
charles-cooper
changed the title
fubuloubu
previously approved these changes
May 5, 2022
fubuloubu
reviewed
May 6, 2022
|
ah i ended up doing some refactoring and forgot to turn this back into a draft |
|
btw it now depends on a change to |
the old way depended on traversing the IR and looking for nodes with specific fields. this uses the function signatures produced during codegen which are more well structured.
|
This pull request introduces 3 alerts when merging a22be84 into 31e2b4e - view on LGTM.com new alerts:
|
|
This pull request introduces 1 alert when merging f75404f into 31e2b4e - view on LGTM.com new alerts:
|
to demonstrate and test topsort working
fubuloubu
reviewed
May 9, 2022
Comment on lines
+148
to
+156
| @internal | ||
| def _stockAvailable() -> uint256: | ||
| return self.holdings[self.company] | ||
|
|
||
| # Find out how much stock any address (that's owned by someone) has. | ||
| @view | ||
| @internal | ||
| def _getHolding(_stockholder: address) -> uint256: | ||
| return self.holdings[_stockholder] |
There was a problem hiding this comment.
These two methods aren't really that useful
There was a problem hiding this comment.
true, i think they are good there just to demonstrate that internal functions can be defined after they are called
Comment on lines
74
to
77
| else: | ||
| # frame size for internal function does not need to be adjusted | ||
| # since it is already accounted for by the caller | ||
| o.total_gas = o.gas | ||
| # note: internal functions do not need to adjust gas estimate since | ||
| # it is already accounted for by the caller. | ||
| pass |
fubuloubu
approved these changes
May 10, 2022
charles-cooper
changed the title
tserg
added a commit
to tserg/vyper
that referenced
this pull request
May 13, 2022
this commit allows the user to call internal functions from the `__init__` function. it does this by generating a call graph during the annotation phase and then generating code for the functions called from the init function for during deploy code generation this also has a performance benefit (compiler time) because we can get rid of the two-pass method for tracing frame size. now that we have a call graph, this commit also introduces a topsort of functions based on the call dependency tree. this ensures we can compile functions that call functions that occur after them in the source code. lastly, this commit also refactors vyper/codegen/module.py so that the payable logic is cleaner, it uses properties instead of calculations more, and cleans up properties on IRnode, FunctionSignature and Context.
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.
What I did
allow calling internal functions from constructor. fixes #1631 and #2318
How I did it
Commit message
How to verify it
Description for the changelog
Cute Animal Picture