java: allocate execute result in C #558
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
axic
commented
Mar 23, 2021
| @@ -95,11 +108,14 @@ JNIEXPORT void JNICALL Java_org_ethereum_evmc_EvmcVm_execute(JNIEnv* jenv, | |||
| struct evmc_vm* evm = (struct evmc_vm*)(*jenv)->GetDirectBufferAddress(jenv, jevm); | |||
| assert(evm != NULL); | |||
| const struct evmc_host_interface* host = evmc_java_get_host_interface(); | |||
| jobject jresult = allocateDirect(jenv, sizeof(struct evmc_result)); | |||
| assert(jresult != NULL); | |||
| struct evmc_result* result = | |||
| (struct evmc_result*)(*jenv)->GetDirectBufferAddress(jenv, jresult); | |||
| assert(result != NULL); | |||
| *result = evmc_execute(evm, host, (struct evmc_host_context*)jcontext, (enum evmc_revision)jrev, | |||
There was a problem hiding this comment.
This is still broken because it just copies the evmc_result struct, but the pointers to output are left loose. We need to move to a proper Java Result class, i.e. #555.
However, the PR does not change semantics.
axic
force-pushed
the
java-execute-alloc
branch
2 times, most recently
from
f2db15a
to
bab5076
Compare
axic
force-pushed
the
java-execute-alloc
branch
from
bab5076
to
1342988
Compare
|
It's been a while. Happy to approve this PR as it seems relatively small, but I have a hard time recalling all the context. If it helps land #555 that's great. |
atoulme
approved these changes
Mar 24, 2021
chfast
approved these changes
Apr 26, 2021
chfast
force-pushed
the
java-execute-alloc
branch
from
1342988
to
ee5bad7
Compare
Codecov Report
@@ Coverage Diff @@
## master #558 +/- ##
=======================================
Coverage 93.78% 93.78%
=======================================
Files 25 25
Lines 3746 3746
=======================================
Hits 3513 3513
Misses 233 233 |
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.
This could be replaced with just passing buffers allocated based on #555.
Part of #548.