Skip to content

Avoid assertion failure from SetFuncAllowAttrs when struct is empty #231

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
tim-hoffman merged 3 commits into from
Dec 3, 2025
Merged

Avoid assertion failure from SetFuncAllowAttrs when struct is empty #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f853ffc
Avoid assertion failure from `SetFuncAllowAttrs` when struct is empty
tim-hoffman Dec 2, 2025
62088b6
changelog
tim-hoffman Dec 2, 2025
e97e7f6
Fix assertion failure from `StructDefOp::verifyRegions()`
tim-hoffman Dec 3, 2025
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 changelogs/unreleased/th__fix_SetFuncAllowAttrs_assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fixed:
- Avoid assertion failure from `SetFuncAllowAttrs` when struct is empty to allow `verify()` to pass on empty StructDefOp
126 changes: 66 additions & 60 deletions lib/Dialect/Struct/IR/Ops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,21 @@ bool isInStructFunctionNamed(Operation *op, char const *funcName) {
// Again, only valid/implemented for StructDefOp
template <> LogicalResult SetFuncAllowAttrs<StructDefOp>::verifyTrait(Operation *structOp) {
assert(llvm::isa<StructDefOp>(structOp));
llvm::cast<StructDefOp>(structOp).getBody()->walk([](FuncDefOp funcDef) {
if (funcDef.nameIsConstrain()) {
funcDef.setAllowConstraintAttr();
funcDef.setAllowWitnessAttr(false);
} else if (funcDef.nameIsCompute()) {
funcDef.setAllowConstraintAttr(false);
funcDef.setAllowWitnessAttr();
} else if (funcDef.nameIsProduct()) {
funcDef.setAllowConstraintAttr();
funcDef.setAllowWitnessAttr();
}
});
Region &bodyRegion = llvm::cast<StructDefOp>(structOp).getBodyRegion();
if (!bodyRegion.empty()) {
bodyRegion.front().walk([](FuncDefOp funcDef) {
if (funcDef.nameIsConstrain()) {
funcDef.setAllowConstraintAttr();
funcDef.setAllowWitnessAttr(false);
} else if (funcDef.nameIsCompute()) {
funcDef.setAllowConstraintAttr(false);
funcDef.setAllowWitnessAttr();
} else if (funcDef.nameIsProduct()) {
funcDef.setAllowConstraintAttr();
funcDef.setAllowWitnessAttr();
}
});
}
return success();
}

Expand Down Expand Up @@ -321,58 +324,61 @@ LogicalResult StructDefOp::verifyRegions() {
// 2. The only functions defined in the struct are `@compute()` and `@constrain()`, or
// `@product()`
OwningEmitErrorFn emitError = getEmitOpErrFn(this);
for (Operation &op : *getBody()) {
if (!llvm::isa<FieldDefOp>(op)) {
if (FuncDefOp funcDef = llvm::dyn_cast<FuncDefOp>(op)) {
if (funcDef.nameIsCompute()) {
if (foundProduct) {
return structFuncDefError(funcDef.getOperation())
<< "found both \"@" << FUNC_NAME_COMPUTE << "\" and \"@" << FUNC_NAME_PRODUCT
<< "\" functions";
}
if (foundCompute) {
return structFuncDefError(funcDef.getOperation())
<< "found multiple \"@" << FUNC_NAME_COMPUTE << "\" functions";
}
foundCompute = std::make_optional(funcDef);
} else if (funcDef.nameIsConstrain()) {
if (foundProduct) {
return structFuncDefError(funcDef.getOperation())
<< "found both \"@" << FUNC_NAME_CONSTRAIN << "\" and \"@" << FUNC_NAME_PRODUCT
<< "\" functions";
}
if (foundConstrain) {
return structFuncDefError(funcDef.getOperation())
<< "found multiple \"@" << FUNC_NAME_CONSTRAIN << "\" functions";
}
foundConstrain = std::make_optional(funcDef);
} else if (funcDef.nameIsProduct()) {
if (foundCompute) {
return structFuncDefError(funcDef.getOperation())
<< "found both \"@" << FUNC_NAME_COMPUTE << "\" and \"@" << FUNC_NAME_PRODUCT
<< "\" functions";
}
if (foundConstrain) {
return structFuncDefError(funcDef.getOperation())
<< "found both \"@" << FUNC_NAME_CONSTRAIN << "\" and \"@" << FUNC_NAME_PRODUCT
<< "\" functions";
}
if (foundProduct) {
Region &bodyRegion = getBodyRegion();
if (!bodyRegion.empty()) {
for (Operation &op : bodyRegion.front()) {
if (!llvm::isa<FieldDefOp>(op)) {
if (FuncDefOp funcDef = llvm::dyn_cast<FuncDefOp>(op)) {
if (funcDef.nameIsCompute()) {
if (foundProduct) {
return structFuncDefError(funcDef.getOperation())
<< "found both \"@" << FUNC_NAME_COMPUTE << "\" and \"@" << FUNC_NAME_PRODUCT
<< "\" functions";
}
if (foundCompute) {
return structFuncDefError(funcDef.getOperation())
<< "found multiple \"@" << FUNC_NAME_COMPUTE << "\" functions";
}
foundCompute = std::make_optional(funcDef);
} else if (funcDef.nameIsConstrain()) {
if (foundProduct) {
return structFuncDefError(funcDef.getOperation())
<< "found both \"@" << FUNC_NAME_CONSTRAIN << "\" and \"@"
<< FUNC_NAME_PRODUCT << "\" functions";
}
if (foundConstrain) {
return structFuncDefError(funcDef.getOperation())
<< "found multiple \"@" << FUNC_NAME_CONSTRAIN << "\" functions";
}
foundConstrain = std::make_optional(funcDef);
} else if (funcDef.nameIsProduct()) {
if (foundCompute) {
return structFuncDefError(funcDef.getOperation())
<< "found both \"@" << FUNC_NAME_COMPUTE << "\" and \"@" << FUNC_NAME_PRODUCT
<< "\" functions";
}
if (foundConstrain) {
return structFuncDefError(funcDef.getOperation())
<< "found both \"@" << FUNC_NAME_CONSTRAIN << "\" and \"@"
<< FUNC_NAME_PRODUCT << "\" functions";
}
if (foundProduct) {
return structFuncDefError(funcDef.getOperation())
<< "found multiple \"@" << FUNC_NAME_PRODUCT << "\" functions";
}
foundProduct = std::make_optional(funcDef);
} else {
// Must do a little more than a simple call to '?.emitOpError()' to
// tag the error with correct location and correct op name.
return structFuncDefError(funcDef.getOperation())
<< "found multiple \"@" << FUNC_NAME_PRODUCT << "\" functions";
<< "found \"@" << funcDef.getSymName() << '"';
}
foundProduct = std::make_optional(funcDef);
} else {
// Must do a little more than a simple call to '?.emitOpError()' to
// tag the error with correct location and correct op name.
return structFuncDefError(funcDef.getOperation())
<< "found \"@" << funcDef.getSymName() << '"';
return op.emitOpError()
<< "invalid operation in '" << StructDefOp::getOperationName() << "'; only '"
<< FieldDefOp::getOperationName() << '\'' << " and '"
<< FuncDefOp::getOperationName() << "' operations are permitted";
}
} else {
return op.emitOpError() << "invalid operation in '" << StructDefOp::getOperationName()
<< "'; only '" << FieldDefOp::getOperationName() << '\''
<< " and '" << FuncDefOp::getOperationName()
<< "' operations are permitted";
}
}
}
Expand Down
Loading