[MLIR][EmitC] Bugfix in emitc.call_opaque operand emission #153980
Merged
Conversation
This file contains hidden or 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
|
@llvm/pr-subscribers-mlir-emitc @llvm/pr-subscribers-mlir Author: Gabriel Dehame (gdehame) ChangesThe operand emission needed the operand to be in scope which lead to failure when the emitc.call_opaque is in an emitc.expression's body Full diff: https://github.com/llvm/llvm-project/pull/153980.diff 1 Files Affected:
diff --git a/mlir/lib/Target/Cpp/TranslateToCpp.cpp b/mlir/lib/Target/Cpp/TranslateToCpp.cpp
index 8e83e455d1a7f..510bf7b72b00c 100644
--- a/mlir/lib/Target/Cpp/TranslateToCpp.cpp
+++ b/mlir/lib/Target/Cpp/TranslateToCpp.cpp
@@ -749,10 +749,8 @@ static LogicalResult printOperation(CppEmitter &emitter,
if (t.getType().isIndex()) {
int64_t idx = t.getInt();
Value operand = op.getOperand(idx);
- if (!emitter.hasValueInScope(operand))
- return op.emitOpError("operand ")
- << idx << "'s value not defined in scope";
- os << emitter.getOrCreateName(operand);
+ if (failed(emitter.emitOperand(operand)))
+ return failure();
return success();
}
}
|
|
Example MLIR leading to an error before fix: |
|
I think it would be good to add a test for this. |
|
@marbre, @simon-camp, @mgehre-amd - this LGTM, but I'm fixing a very similar bug in #155171 so I'm biased. Could you take a look? |
simon-camp
approved these changes
Aug 24, 2025
| return op.emitOpError("operand ") | ||
| << idx << "'s value not defined in scope"; | ||
| os << emitter.getOrCreateName(operand); | ||
| if (failed(emitter.emitOperand(operand))) |
There was a problem hiding this comment.
You can return emitter.emitOperand directly.
| yield %4 : i1 | ||
| } | ||
| return | ||
| } |
41b704a to
c03d58f
Compare
The operand emission needed the operand to be in scope which lead to failure when the emitc.call_opaque is in an emitc.expression's body
c03d58f to
4168756
Compare
|
Fixed format and squashed commits to merge a single commit |
Yes please |
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.
The operand emission needed the operand to be in scope which lead to failure when the emitc.call_opaque is in an emitc.expression's body