[CIR][CIRGen] Create a new block after break and continue #611
+123
−31
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
Without this patch, CIR CodeGen continue to generate in the same block after cir.break and cir.continue, which would cause verification error because cir.break and cir.continue should appear at the end of blocks. This patch creates a new dangling block after generating cir.break and cir.continue to fix the issue.
piggynl
commented
May 16, 2024
Comment on lines
-554
to
-560
| mlir::Block *currBlock = builder.getBlock(); | ||
| mlir::Block *gotoBlock = currBlock; | ||
| if (!currBlock->empty() && | ||
| currBlock->back().hasTrait<mlir::OpTrait::IsTerminator>()) { | ||
| gotoBlock = builder.createBlock(builder.getBlock()->getParent()); | ||
| builder.setInsertionPointToEnd(gotoBlock); | ||
| } |
There was a problem hiding this comment.
This part of code was used for test shouldCreateBlkForGoto in clang/test/CIR/CodeGen/goto.cpp. However, it is unrelated to goto, but a workaround for the broken code for break. This patch also moves the test to switch.cpp and renamed it to unreachable_after_break_1.
| @@ -0,0 +1,22 @@ | |||
| // RUN: %clang_cc1 -std=c++17 -triple x86_64-unknown-linux-gnu -fclangir -emit-cir %s -o %t.cir | |||
| // RUN: FileCheck --input-file=%t.cir %s | |||
| // XFAIL: * | |||
There was a problem hiding this comment.
These tests are failing because the insertion point is restored by an InsertionGuard in buildSwitchBody(). I suggest revising that part after #528 is merged to avoid conflict.
clangir/clang/lib/CIR/CodeGen/CIRGenStmt.cpp
Lines 972 to 978 in 3da10fa
|
I'm going to resume reviewing this, sorry for the delay! |
bcardosolopes
approved these changes
Jun 6, 2024
This was referenced Jun 6, 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.
Without this patch, CIR CodeGen continue to generate in the same block after
cir.breakandcir.continue, which would cause verification error becausecir.breakandcir.continueshould appear at the end of blocks.This patch creates a new dangling block after generating
cir.breakandcir.continueto fix the issue.This will fix #323.