- Notifications
You must be signed in to change notification settings - Fork14.5k
[mlir][py] Fix nanobind uninitialized values#148944
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Merged
+48 −24
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
Afterllvm#143866, we no longer always write to `value`, causing it to be uninitialized. This can lead to mysterious crashes, e.g. in `testCustomAttribute` when we attempt to evaluate `TestAttr(42)`, it does not set `value`, but `mlirAttributeIsNull(value)` happens to return false for garbage memory, and we end up trying to interpret it as a function instead of skipping it.
@llvm/pr-subscribers-mlir Author: Jordan Rupprecht (rupprecht) ChangesAfter #143866, we no longer always write to Fix this by only reading Full diff:https://github.com/llvm/llvm-project/pull/148944.diff 1 Files Affected:
diff --git a/mlir/include/mlir/Bindings/Python/NanobindAdaptors.h b/mlir/include/mlir/Bindings/Python/NanobindAdaptors.hindex 8dcf91e5806bd..1428d5ccf00f4 100644--- a/mlir/include/mlir/Bindings/Python/NanobindAdaptors.h+++ b/mlir/include/mlir/Bindings/Python/NanobindAdaptors.h@@ -65,9 +65,11 @@ template <> struct type_caster<MlirAffineMap> { NB_TYPE_CASTER(MlirAffineMap, const_name("MlirAffineMap")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToAffineMap(capsule->ptr());- return !mlirAffineMapIsNull(value);+ return !mlirAffineMapIsNull(value);+ }+ return false; } static handle from_cpp(MlirAffineMap v, rv_policy, cleanup_list *cleanup) noexcept {@@ -85,9 +87,11 @@ template <> struct type_caster<MlirAttribute> { NB_TYPE_CASTER(MlirAttribute, const_name("MlirAttribute")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToAttribute(capsule->ptr());- return !mlirAttributeIsNull(value);+ return !mlirAttributeIsNull(value);+ }+ return false; } static handle from_cpp(MlirAttribute v, rv_policy, cleanup_list *cleanup) noexcept {@@ -106,9 +110,11 @@ template <> struct type_caster<MlirBlock> { NB_TYPE_CASTER(MlirBlock, const_name("MlirBlock")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToBlock(capsule->ptr());- return !mlirBlockIsNull(value);+ return !mlirBlockIsNull(value);+ }+ return false; } };@@ -137,9 +143,11 @@ template <> struct type_caster<MlirDialectRegistry> { NB_TYPE_CASTER(MlirDialectRegistry, const_name("MlirDialectRegistry")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToDialectRegistry(capsule->ptr());- return !mlirDialectRegistryIsNull(value);+ return !mlirDialectRegistryIsNull(value);+ }+ return false; } static handle from_cpp(MlirDialectRegistry v, rv_policy, cleanup_list *cleanup) noexcept {@@ -163,9 +171,11 @@ struct type_caster<MlirLocation> { .attr("Location") .attr("current"); }- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToLocation(capsule->ptr());- return !mlirLocationIsNull(value);+ return !mlirLocationIsNull(value);+ }+ return false; } static handle from_cpp(MlirLocation v, rv_policy, cleanup_list *cleanup) noexcept {@@ -183,9 +193,11 @@ template <> struct type_caster<MlirModule> { NB_TYPE_CASTER(MlirModule, const_name("MlirModule")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToModule(capsule->ptr());- return !mlirModuleIsNull(value);+ return !mlirModuleIsNull(value);+ }+ return false; } static handle from_cpp(MlirModule v, rv_policy, cleanup_list *cleanup) noexcept {@@ -204,9 +216,11 @@ struct type_caster<MlirFrozenRewritePatternSet> { NB_TYPE_CASTER(MlirFrozenRewritePatternSet, const_name("MlirFrozenRewritePatternSet")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToFrozenRewritePatternSet(capsule->ptr());- return value.ptr != nullptr;+ return value.ptr != nullptr;+ }+ return false; } static handle from_cpp(MlirFrozenRewritePatternSet v, rv_policy, handle) noexcept {@@ -224,9 +238,11 @@ template <> struct type_caster<MlirOperation> { NB_TYPE_CASTER(MlirOperation, const_name("MlirOperation")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToOperation(capsule->ptr());- return !mlirOperationIsNull(value);+ return !mlirOperationIsNull(value);+ }+ return false; } static handle from_cpp(MlirOperation v, rv_policy, cleanup_list *cleanup) noexcept {@@ -246,9 +262,11 @@ template <> struct type_caster<MlirValue> { NB_TYPE_CASTER(MlirValue, const_name("MlirValue")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToValue(capsule->ptr());- return !mlirValueIsNull(value);+ return !mlirValueIsNull(value);+ }+ return false; } static handle from_cpp(MlirValue v, rv_policy, cleanup_list *cleanup) noexcept {@@ -269,9 +287,11 @@ template <> struct type_caster<MlirPassManager> { NB_TYPE_CASTER(MlirPassManager, const_name("MlirPassManager")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToPassManager(capsule->ptr());- return !mlirPassManagerIsNull(value);+ return !mlirPassManagerIsNull(value);+ }+ return false; } };@@ -280,9 +300,11 @@ template <> struct type_caster<MlirTypeID> { NB_TYPE_CASTER(MlirTypeID, const_name("MlirTypeID")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToTypeID(capsule->ptr());- return !mlirTypeIDIsNull(value);+ return !mlirTypeIDIsNull(value);+ }+ return false; } static handle from_cpp(MlirTypeID v, rv_policy, cleanup_list *cleanup) noexcept {@@ -302,9 +324,11 @@ template <> struct type_caster<MlirType> { NB_TYPE_CASTER(MlirType, const_name("MlirType")) bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {- if (auto capsule = mlirApiObjectToCapsule(src))+ if (auto capsule = mlirApiObjectToCapsule(src)) { value = mlirPythonCapsuleToType(capsule->ptr());- return !mlirTypeIsNull(value);+ return !mlirTypeIsNull(value);+ }+ return false; } static handle from_cpp(MlirType t, rv_policy, cleanup_list *cleanup) noexcept { |
makslevental approved these changesJul 15, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
That's my fault - I was being too clever 😓. This is actually the pattern that was here before and I changed it to the more terse version thinking it was an oversight but I guess it was exactly to catch this error.
Thanks.
1a940bf intollvm:main 10 of 11 checks passed
Uh oh!
There was an error while loading.Please reload this page.
No problem, that's why we have tests :) |
The windows fail here is/was due to#148963 |
Sign up for freeto 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.
After#143866, we no longer always write to
value, causing it to be uninitialized. This can lead to mysterious crashes, e.g. inpython_test.py/testCustomAttributewhen we attempt to evaluateTestAttr(42), it does not setvalue, butmlirAttributeIsNull(value)happens to return false for garbage memory, and we end up trying to interpret it as a function instead of skipping it.Fix this by only reading
valueif it has been assigned. If it hasn't,return falseseems the right choice for all these methods, i.e. indicate thatfrom_pythonfailed.