Skip to content

[CIR][CodeGen][NFC] Add some missing guards for unreachable #1022

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 10 commits into from
Oct 30, 2024
Merged

[CIR][CodeGen][NFC] Add some missing guards for unreachable #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
411ff45
[𝘀𝗽𝗿] initial version
lanza Oct 29, 2024
b706af7
[𝘀𝗽𝗿] changes to main this commit is based on
lanza Oct 29, 2024
e12a49f
fix typo
lanza Oct 29, 2024
bd3fce5
fix
lanza Oct 29, 2024
bf79648
[𝘀𝗽𝗿] changes introduced through rebase
lanza Oct 30, 2024
bd41e9c
add todo
lanza Oct 30, 2024
4e04610
[𝘀𝗽𝗿] changes introduced through rebase
lanza Oct 30, 2024
64cdc8f
rebase
lanza Oct 30, 2024
6aeab23
[𝘀𝗽𝗿] changes introduced through rebase
gitoleg Oct 30, 2024
71410f1
reorder
lanza Oct 30, 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
2 changes: 2 additions & 0 deletions clang/include/clang/CIR/MissingFeatures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,8 @@ struct MissingFeatures {

// This Itanium bit is currently being skipped in cir.
static bool itaniumRecordLayoutBuilderFinishLayout() { return false; }

static bool mustProgress() { return false; }
};

} // namespace cir
Expand Down
3 changes: 3 additions & 0 deletions clang/lib/CIR/CodeGen/CIRGenDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,9 @@ void CIRGenFunction::buildStaticVarDecl(const VarDecl &D,
else if (D.hasAttr<UsedAttr>())
llvm_unreachable("llvm.compiler.used metadata is NYI");

if (CGM.getCodeGenOpts().KeepPersistentStorageVariables)
llvm_unreachable("NYI");

// From traditional codegen:
// We may have to cast the constant because of the initializer
// mismatch above.
Expand Down
10 changes: 9 additions & 1 deletion clang/lib/CIR/CodeGen/CIRGenFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,8 +699,16 @@ CIRGenFunction::generateCode(clang::GlobalDecl GD, mlir::cir::FuncOp Fn,
if (Body && isa_and_nonnull<CoroutineBodyStmt>(Body))
llvm::append_range(FnArgs, FD->parameters());

// Ensure that the function adheres to the forward progress guarantee, which
// is required by certain optimizations.
// In C++11 and up, the attribute will be removed if the body contains a
// trivial empty loop.
if (MissingFeatures::mustProgress())
llvm_unreachable("NYI");

// Generate the body of the function.
// TODO: PGO.assignRegionCounters
assert(!MissingFeatures::shouldInstrumentFunction());
if (isa<CXXDestructorDecl>(FD))
buildDestructorBody(Args);
else if (isa<CXXConstructorDecl>(FD))
Expand Down Expand Up @@ -751,7 +759,7 @@ mlir::Value CIRGenFunction::createLoad(const VarDecl *VD, const char *Name) {
}

void CIRGenFunction::buildConstructorBody(FunctionArgList &Args) {
// TODO: EmitAsanPrologueOrEpilogue(true);
assert(!MissingFeatures::emitAsanPrologueOrEpilogue());
const auto *Ctor = cast<CXXConstructorDecl>(CurGD.getDecl());
auto CtorType = CurGD.getCtorType();

Expand Down
2 changes: 2 additions & 0 deletions clang/lib/CIR/CodeGen/CIRGenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2434,6 +2434,8 @@ mlir::cir::FuncOp CIRGenModule::createRuntimeFunction(
if (AssumeConvergent) {
llvm_unreachable("NYI");
}
if (Local)
llvm_unreachable("NYI");

auto entry = GetOrCreateCIRFunction(Name, Ty, GlobalDecl(),
/*ForVtable=*/false);
Expand Down