Skip to content

[CIR][CodeGen][BugFix] don't place alloca before the label #875

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.

Sign up for GitHub

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 3 commits into from
Sep 23, 2024
Merged

[CIR][CodeGen][BugFix] don't place alloca before the label #875

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa967bf
[CIR][CodeGen][BugFix] don't place alloca before the label
gitoleg Sep 23, 2024
17d4a11
minor
gitoleg Sep 23, 2024
83d5b28
Add EOL
bcardosolopes Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,14 +538,14 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
// ----------------------
//
OpBuilder::InsertPoint getBestAllocaInsertPoint(mlir::Block *block) {
auto lastAlloca =
auto last =
std::find_if(block->rbegin(), block->rend(), [](mlir::Operation &op) {
return mlir::isa<mlir::cir::AllocaOp>(&op);
return mlir::isa<mlir::cir::AllocaOp, mlir::cir::LabelOp>(&op);
});

if (lastAlloca != block->rend())
if (last != block->rend())
return OpBuilder::InsertPoint(block,
++mlir::Block::iterator(&*lastAlloca));
++mlir::Block::iterator(&*last));
return OpBuilder::InsertPoint(block, block->begin());
};

Expand Down
18 changes: 17 additions & 1 deletion clang/test/CIR/CodeGen/goto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,20 @@ void flatLoopWithNoTerminatorInFront(int* ptr) {
// CHECK: ^bb[[#RETURN]]:
// CHECK: cir.return
// CHECK: }
// CHECK:}
// CHECK:}

struct S {};
struct S get();
void bar(struct S);

void foo() {
{
label:
bar(get());
}
}

// NOFLAT: cir.func @_Z3foov()
// NOFLAT: cir.scope {
// NOFLAT: cir.label "label"
// NOFLAT: %0 = cir.alloca !ty_S, !cir.ptr<!ty_S>, ["agg.tmp0"]