Fixes https://github.com/sampsyo/bril/issues/342 #343
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
|
Seems like brilift also has this issue. The slight wrinkle is that jumps in cranelift take arguments. I've used a trap instead with an arbitrarily chosen trap code... which is maybe a more principled solution anyways. |
oflatt
approved these changes
Oct 23, 2024
| // This block did not have a terminating instruction | ||
| // Returning void is ill-typed for this function | ||
| // This code should be unreachable in well-formed Bril | ||
| // Let's just arbitrarily jump to avoid needing to |
| @@ -1294,28 +1294,29 @@ pub fn create_module_from_program<'a>( | |||
| } | |||
| }); | |||
|
|
|||
| (llvm_func, instrs, block, heap) | |||
| (llvm_func, instrs, block, heap, return_type) | |||
There was a problem hiding this comment.
could preserve original function here instead of instrs and return_type
That, or do a zip later with the original functions and the llvm ones
|
Awesome; good thinking here!! And trapping in the generated CLIF seems like a good idea. I'll poke around in the Cranelift docs to see if there's something else obvious to use here, just in case. |
sampsyo
added a commit
that referenced
this pull request
Oct 26, 2024
Pat-Lafon
pushed a commit
to Pat-Lafon/bril
that referenced
this pull request
Nov 4, 2024
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.
Unterminated, non-void basic_blocks weren't handled in brillvm. I think this is only ever an issue of dead code(for if this was reachable, then the Bril code would not be well-formed).
The simplest solution may actually be to insert a jump to some arbitrary block instead of trying to craft a well-typed return.