-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed #3082: Crash when doing exit/NoReturn in ensure.
Also documented codegen for exceptions because it's pretty tricky, and did some minor cleanups.
- v0.24.1
- 1.15.1
- 1.15.0
- 1.14.1
- 1.14.0
- 1.13.3
- 1.13.2
- 1.13.1
- 1.13.0
- 1.12.2
- 1.12.1
- 1.12.0
- 1.11.2
- 1.11.1
- 1.11.0
- 1.10.1
- 1.10.0
- 1.9.2
- 1.9.1
- 1.9.0
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.3
- 1.7.2
- 1.7.1
- 1.7.0
- 1.6.2
- 1.6.1
- 1.6.0
- 1.5.1
- 1.5.0
- 1.4.1
- 1.4.0
- 1.3.2
- 1.3.1
- 1.3.0
- 1.2.2
- 1.2.1
- 1.2.0
- 1.1.1
- 1.1.0
- 1.0.0
- 0.36.1
- 0.36.0
- 0.35.1
- 0.35.0
- 0.34.0
- 0.33.0
- 0.32.1
- 0.32.0
- 0.31.1
- 0.31.0
- 0.30.1
- 0.30.0
- 0.29.0
- 0.28.0
- 0.27.2
- 0.27.1
- 0.27.0
- 0.26.1
- 0.26.0
- 0.25.1
- 0.25.0
- 0.24.2
- 0.24.1
- 0.24.0
- 0.23.1
- 0.23.0
- 0.22.0
- 0.21.1
- 0.21.0
- 0.20.5
- 0.20.4
- 0.20.3
- 0.20.2
- 0.20.1
- 0.20.0
- 0.19.4
- 0.19.3
- 0.19.2
- 0.19.1
- 0.19.0
Ary Borenszweig
committed
Aug 3, 2016
1 parent
23aa829
commit 7ae7978
Showing
5 changed files
with
256 additions
and
153 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,217 @@ | ||
| require "./codegen" | ||
|
|
||
| class Crystal::CodeGenVisitor | ||
| @node_ensure_exception_handlers = {} of UInt64 => Handler | ||
|
|
||
| def visit(node : ExceptionHandler) | ||
| rescue_block = new_block "rescue" | ||
|
|
||
| node_rescues = node.rescues | ||
| node_ensure = node.ensure | ||
| node_else = node.else | ||
| rescue_ensure_block = nil | ||
|
|
||
| # Here we transform this: | ||
| # | ||
| # ``` | ||
| # begin | ||
| # body | ||
| # rescue ex : Ex1 | ||
| # rescue_1_body | ||
| # rescue ex : Ex2 | ||
| # rescue_2_body | ||
| # rescue | ||
| # rescue_3_body | ||
| # ensure | ||
| # ensure_body | ||
| # end | ||
| # ``` | ||
| # | ||
| # Into something like this: | ||
| # | ||
| # ``` | ||
| # # 1) Any exception raised in the body will end up in `rescue_block` | ||
| # setup_rescue_block | ||
| # | ||
| # # 2) Codegen body, and `else` if available | ||
| # body/else | ||
| # goto exit | ||
| # | ||
| # # 3) Any exception raised in a rescue block will end up in `rescue_ensure_block` | ||
| # setup_rescue_ensure_block | ||
| # | ||
| # # 4) rescue_block: | ||
| # if ex.is_a?(Ex1) | ||
| # rescue_1_body | ||
| # goto exit | ||
| # end | ||
| # | ||
| # if ex.is_a?(Ex2) | ||
| # rescue_2_body | ||
| # goto exit | ||
| # end | ||
| # | ||
| # if ex | ||
| # rescue_3_body | ||
| # goto exit | ||
| # end | ||
| # | ||
| # # 5) No raise clause matched, so we execute the ensure body and re-raise | ||
| # # (can happen if there's no general `raise` or `raise ex` clause) | ||
| # ensure_body | ||
| # raise ex | ||
| # | ||
| # # 6) rescue_ensure_block: | ||
| # ensure_body | ||
| # raise ex | ||
| # | ||
| # # 7) exit: | ||
| # ensure_body | ||
| # ``` | ||
| # | ||
| # Note that we generate the ensure body multiple times. | ||
| # We could probably avoid this, but ensure bodies are usually small so | ||
| # the code duplication is not so terrible. | ||
| Phi.open(self, node, @needs_value) do |phi| | ||
| # If there's an ensure block, even if the body/else | ||
| # and all rescues are NoReturn we must still generate the | ||
| # ensure part, which is done in the exit block. | ||
| phi.force_exit_block = !!node_ensure | ||
|
|
||
| ensure_exception_handlers = (@ensure_exception_handlers ||= [] of Handler) | ||
| ensure_exception_handlers.push Handler.new(node, context) | ||
|
|
||
| # 1) | ||
| old_rescue_block = @rescue_block | ||
| @rescue_block = rescue_block | ||
| accept node.body | ||
| @rescue_block = old_rescue_block | ||
|
|
||
| # 2) | ||
| # If there's an else, we take the value from it. | ||
| # Otherwise, the value is taken from the body. | ||
| if node_else | ||
| accept node_else | ||
| phi.add @last, node_else.type? | ||
| else | ||
| phi.add @last, node.body.type? | ||
| end | ||
|
|
||
| position_at_end rescue_block | ||
| lp_ret_type = llvm_typer.landing_pad_type | ||
| lp = builder.landing_pad lp_ret_type, main_fun(PERSONALITY_NAME), [] of LLVM::Value | ||
| unwind_ex_obj = extract_value lp, 0 | ||
| ex_type_id = extract_value lp, 1 | ||
|
|
||
| if node_rescues | ||
| if node_ensure | ||
| rescue_ensure_block = new_block "rescue_ensure" | ||
| end | ||
|
|
||
| # 3) | ||
| # Make sure the rescue knows about the current ensure | ||
| # and the previous catch block | ||
| old_rescue_block = @rescue_block | ||
| @rescue_block = rescue_ensure_block || @rescue_block | ||
|
|
||
| node_rescues.each do |a_rescue| | ||
| # 4) | ||
| this_rescue_block, next_rescue_block = new_blocks "this_rescue", "next_rescue" | ||
| if a_rescue_types = a_rescue.types | ||
| cond = nil | ||
| a_rescue_types.each do |type| | ||
| rescue_type = type.type.instance_type.virtual_type | ||
| rescue_type_cond = match_any_type_id(rescue_type, ex_type_id) | ||
| cond = cond ? or(cond, rescue_type_cond) : rescue_type_cond | ||
| end | ||
| cond cond.not_nil!, this_rescue_block, next_rescue_block | ||
| else | ||
| br this_rescue_block | ||
| end | ||
| position_at_end this_rescue_block | ||
|
|
||
| with_cloned_context do | ||
| if a_rescue_name = a_rescue.name | ||
| context.vars = context.vars.dup | ||
| get_exception_fun = main_fun(GET_EXCEPTION_NAME) | ||
| exception_ptr = call get_exception_fun, [bit_cast(unwind_ex_obj, get_exception_fun.params.first.type)] | ||
| exception = int2ptr exception_ptr, LLVMTyper::TYPE_ID_POINTER | ||
| unless a_rescue.type.virtual? | ||
| exception = cast_to exception, a_rescue.type | ||
| end | ||
| var = context.vars[a_rescue_name] | ||
| assign var.pointer, var.type, a_rescue.type, exception | ||
| end | ||
|
|
||
| accept a_rescue.body | ||
| end | ||
| phi.add @last, a_rescue.body.type? | ||
|
|
||
| position_at_end next_rescue_block | ||
| end | ||
|
|
||
| @rescue_block = old_rescue_block | ||
| end | ||
|
|
||
| ensure_exception_handlers.pop | ||
|
|
||
| # 5) No raise clause matched, so we execute the ensure body (if any) and re-raise | ||
| accept node_ensure if node_ensure | ||
|
|
||
| raise_fun = main_fun(RAISE_NAME) | ||
| codegen_call_or_invoke(node, nil, nil, raise_fun, [bit_cast(unwind_ex_obj, raise_fun.params.first.type)], true, @program.no_return) | ||
| end | ||
|
|
||
| old_last = @last | ||
| builder_end = @builder.end | ||
|
|
||
| # 7) | ||
| if node_ensure && !builder_end | ||
| accept node_ensure | ||
| builder_end = @builder.end | ||
| end | ||
|
|
||
| if node_ensure && rescue_ensure_block | ||
| # 6) | ||
| old_block = insert_block | ||
| position_at_end rescue_ensure_block | ||
| lp_ret_type = llvm_typer.landing_pad_type | ||
| lp = builder.landing_pad lp_ret_type, main_fun(PERSONALITY_NAME), [] of LLVM::Value | ||
| unwind_ex_obj = extract_value lp, 0 | ||
|
|
||
| accept node_ensure | ||
| raise_fun = main_fun(RAISE_NAME) | ||
| codegen_call_or_invoke(node, nil, nil, raise_fun, [bit_cast(unwind_ex_obj, raise_fun.params.first.type)], true, @program.no_return) | ||
|
|
||
| position_at_end old_block | ||
|
|
||
| # Since we went to another block, we must restore the 'end' state | ||
| @builder.end = builder_end | ||
| end | ||
|
|
||
| @last = old_last | ||
|
|
||
| false | ||
| end | ||
|
|
||
| def execute_ensures_until(node) | ||
| stop_exception_handler = @node_ensure_exception_handlers[node.object_id]?.try &.node | ||
|
|
||
| @ensure_exception_handlers.try &.reverse_each do |exception_handler| | ||
| break if exception_handler.node.same?(stop_exception_handler) | ||
|
|
||
| target_ensure = exception_handler.node.ensure | ||
| next unless target_ensure | ||
|
|
||
| with_context(exception_handler.context) do | ||
| target_ensure.accept self | ||
| end | ||
| end | ||
| end | ||
|
|
||
| def set_ensure_exception_handler(node) | ||
| if eh = @ensure_exception_handlers.try &.last? | ||
| @node_ensure_exception_handlers[node.object_id] = eh | ||
| end | ||
| end | ||
| end |
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