-
Notifications
You must be signed in to change notification settings - Fork 85
assembly and ast #95
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
Merged
Merged
assembly and ast #95
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| pragma solidity ^0.4.24; | ||
|
|
||
| /** | ||
| * @title Proxy | ||
| * @dev Gives the possibility to delegate any call to a foreign implementation. | ||
| */ | ||
| contract Proxy { | ||
|
|
||
| /** | ||
| * @dev Tells the address of the implementation where every call will be delegated. | ||
| * @return address of the implementation to which it will be delegated | ||
| */ | ||
| function _implementation() internal view returns (address); | ||
|
|
||
| /** | ||
| * @dev Fallback function. | ||
| * Implemented entirely in `_fallback`. | ||
| */ | ||
| function _fallback() internal { | ||
| _delegate(_implementation()); | ||
| } | ||
|
|
||
| /** | ||
| * @dev Fallback function allowing to perform a delegatecall to the given implementation. | ||
| * This function will return whatever the implementation call returns | ||
| */ | ||
| function _delegate(address implementation) internal { | ||
| /*solium-disable-next-line security/no-inline-assembly*/ | ||
| assembly { | ||
| // Copy msg.data. We take full control of memory in this inline assembly | ||
| // block because it will not return to Solidity code. We overwrite the | ||
| // Solidity scratch pad at memory position 0. | ||
| calldatacopy(0, 0, calldatasize) | ||
|
|
||
| // Call the implementation. | ||
| // out and outsize are 0 because we don't know the size yet. | ||
| let result := delegatecall(gas, implementation, 0, calldatasize, 0, 0) | ||
|
|
||
| // Copy the returned data. | ||
| returndatacopy(0, 0, returndatasize) | ||
|
|
||
| switch result | ||
| // delegatecall returns 0 on error. | ||
| case 0 { revert(0, returndatasize) } | ||
| default { return(0, returndatasize) } | ||
| } | ||
| } | ||
|
|
||
| function () public payable { | ||
| _fallback(); | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`Proxy.sol 1`] = ` | ||
| pragma solidity ^0.4.24; | ||
|
|
||
| /** | ||
| * @title Proxy | ||
| * @dev Gives the possibility to delegate any call to a foreign implementation. | ||
| */ | ||
| contract Proxy { | ||
|
|
||
| /** | ||
| * @dev Tells the address of the implementation where every call will be delegated. | ||
| * @return address of the implementation to which it will be delegated | ||
| */ | ||
| function _implementation() internal view returns (address); | ||
|
|
||
| /** | ||
| * @dev Fallback function. | ||
| * Implemented entirely in \`_fallback\`. | ||
| */ | ||
| function _fallback() internal { | ||
| _delegate(_implementation()); | ||
| } | ||
|
|
||
| /** | ||
| * @dev Fallback function allowing to perform a delegatecall to the given implementation. | ||
| * This function will return whatever the implementation call returns | ||
| */ | ||
| function _delegate(address implementation) internal { | ||
| /*solium-disable-next-line security/no-inline-assembly*/ | ||
| assembly { | ||
| // Copy msg.data. We take full control of memory in this inline assembly | ||
| // block because it will not return to Solidity code. We overwrite the | ||
| // Solidity scratch pad at memory position 0. | ||
| calldatacopy(0, 0, calldatasize) | ||
|
|
||
| // Call the implementation. | ||
| // out and outsize are 0 because we don't know the size yet. | ||
| let result := delegatecall(gas, implementation, 0, calldatasize, 0, 0) | ||
|
|
||
| // Copy the returned data. | ||
| returndatacopy(0, 0, returndatasize) | ||
|
|
||
| switch result | ||
| // delegatecall returns 0 on error. | ||
| case 0 { revert(0, returndatasize) } | ||
| default { return(0, returndatasize) } | ||
| } | ||
| } | ||
|
|
||
| function () public payable { | ||
| _fallback(); | ||
| } | ||
| } | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| pragma solidity ^0.4.24; | ||
|
|
||
| /** | ||
| * @title Proxy | ||
| * @dev Gives the possibility to delegate any call to a foreign implementation. | ||
| */ | ||
| contract Proxy { | ||
| /** | ||
| * @dev Tells the address of the implementation where every call will be delegated. | ||
| * @return address of the implementation to which it will be delegated | ||
| */ | ||
| function _implementation() internal view returns (address); | ||
|
|
||
| /** | ||
| * @dev Fallback function. | ||
| * Implemented entirely in \`_fallback\`. | ||
| */ | ||
| function _fallback() internal { | ||
| _delegate(_implementation()); | ||
| } | ||
|
|
||
| /** | ||
| * @dev Fallback function allowing to perform a delegatecall to the given implementation. | ||
| * This function will return whatever the implementation call returns | ||
| */ | ||
| function _delegate(address implementation) internal { | ||
| /*solium-disable-next-line security/no-inline-assembly*/ | ||
| assembly { | ||
| // Copy msg.data. We take full control of memory in this inline assembly | ||
| // block because it will not return to Solidity code. We overwrite the | ||
| // Solidity scratch pad at memory position 0. | ||
| calldatacopy(0, 0, calldatasize) | ||
| // Call the implementation. | ||
| // out and outsize are 0 because we don't know the size yet. | ||
| let result := delegatecall(gas, implementation, 0, calldatasize, 0, 0) | ||
| // Copy the returned data. | ||
| returndatacopy(0, 0, returndatasize) | ||
| switch result | ||
| // delegatecall returns 0 on error. | ||
| case 0 {} | ||
| default {} | ||
| } | ||
| } | ||
|
|
||
| function() public payable { | ||
| _fallback(); | ||
| } | ||
| } | ||
|
|
||
| `; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| run_spec(__dirname); |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is in order to bypass the problem w/
AST_COMPARE=trueThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is no longer necessary. Merging master into this branch fixes the issue.