[WebAssembly] Fix crash combining complex numbers and multivalue#200514
Merged
Conversation
This fixes a crash in Clang when the `experimental-mv` ABI is used on WebAssembly targets in conjunction with complex numbers as arguments. There's no strict definition for what the multivalue ABI is at this time, so the main goal is to just not crash for now. Closes llvm#70402
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-backend-webassembly Author: Alex Crichton (alexcrichton) ChangesThis fixes a crash in Clang when the Closes #70402 Full diff: https://github.com/llvm/llvm-project/pull/200514.diff 2 Files Affected:
diff --git a/clang/lib/CodeGen/Targets/WebAssembly.cpp b/clang/lib/CodeGen/Targets/WebAssembly.cpp
index ebe996a4edd8d..71454982c4f82 100644
--- a/clang/lib/CodeGen/Targets/WebAssembly.cpp
+++ b/clang/lib/CodeGen/Targets/WebAssembly.cpp
@@ -115,16 +115,20 @@ ABIArgInfo WebAssemblyABIInfo::classifyArgumentType(QualType Ty) const {
return ABIArgInfo::getDirect(CGT.ConvertType(QualType(SeltTy, 0)));
// For the experimental multivalue ABI, fully expand all other aggregates
if (Kind == WebAssemblyABIKind::ExperimentalMV) {
- const auto *RD = Ty->castAsRecordDecl();
- bool HasBitField = false;
- for (auto *Field : RD->fields()) {
- if (Field->isBitField()) {
- HasBitField = true;
- break;
+ if (Ty->getAs<ComplexType>())
+ return ABIArgInfo::getDirect();
+ const auto *RD = Ty->getAsRecordDecl();
+ if (RD) {
+ bool HasBitField = false;
+ for (auto *Field : RD->fields()) {
+ if (Field->isBitField()) {
+ HasBitField = true;
+ break;
+ }
}
+ if (!HasBitField)
+ return ABIArgInfo::getExpand();
}
- if (!HasBitField)
- return ABIArgInfo::getExpand();
}
}
diff --git a/clang/test/CodeGen/WebAssembly/wasm-arguments.c b/clang/test/CodeGen/WebAssembly/wasm-arguments.c
index a0914fc768809..4bb381ea7b89d 100644
--- a/clang/test/CodeGen/WebAssembly/wasm-arguments.c
+++ b/clang/test/CodeGen/WebAssembly/wasm-arguments.c
@@ -138,3 +138,13 @@ bitfield1 bitfield_ret(void) {
bitfield1 baz;
return baz;
}
+
+// Complex numbers are expanded in parameter position for the multivalue
+// experimental ABI.
+
+// WEBASSEMBLY32: define void @complex_double(ptr
+// WEBASSEMBLY64: define void @complex_double(ptr
+// EXPERIMENTAL-MV: define void @complex_double(double {{.*}}, double {{.*}})
+void complex_double(_Complex double a) {
+ // ..
+}
|
|
@llvm/pr-subscribers-clang-codegen Author: Alex Crichton (alexcrichton) ChangesThis fixes a crash in Clang when the Closes #70402 Full diff: https://github.com/llvm/llvm-project/pull/200514.diff 2 Files Affected:
diff --git a/clang/lib/CodeGen/Targets/WebAssembly.cpp b/clang/lib/CodeGen/Targets/WebAssembly.cpp
index ebe996a4edd8d..71454982c4f82 100644
--- a/clang/lib/CodeGen/Targets/WebAssembly.cpp
+++ b/clang/lib/CodeGen/Targets/WebAssembly.cpp
@@ -115,16 +115,20 @@ ABIArgInfo WebAssemblyABIInfo::classifyArgumentType(QualType Ty) const {
return ABIArgInfo::getDirect(CGT.ConvertType(QualType(SeltTy, 0)));
// For the experimental multivalue ABI, fully expand all other aggregates
if (Kind == WebAssemblyABIKind::ExperimentalMV) {
- const auto *RD = Ty->castAsRecordDecl();
- bool HasBitField = false;
- for (auto *Field : RD->fields()) {
- if (Field->isBitField()) {
- HasBitField = true;
- break;
+ if (Ty->getAs<ComplexType>())
+ return ABIArgInfo::getDirect();
+ const auto *RD = Ty->getAsRecordDecl();
+ if (RD) {
+ bool HasBitField = false;
+ for (auto *Field : RD->fields()) {
+ if (Field->isBitField()) {
+ HasBitField = true;
+ break;
+ }
}
+ if (!HasBitField)
+ return ABIArgInfo::getExpand();
}
- if (!HasBitField)
- return ABIArgInfo::getExpand();
}
}
diff --git a/clang/test/CodeGen/WebAssembly/wasm-arguments.c b/clang/test/CodeGen/WebAssembly/wasm-arguments.c
index a0914fc768809..4bb381ea7b89d 100644
--- a/clang/test/CodeGen/WebAssembly/wasm-arguments.c
+++ b/clang/test/CodeGen/WebAssembly/wasm-arguments.c
@@ -138,3 +138,13 @@ bitfield1 bitfield_ret(void) {
bitfield1 baz;
return baz;
}
+
+// Complex numbers are expanded in parameter position for the multivalue
+// experimental ABI.
+
+// WEBASSEMBLY32: define void @complex_double(ptr
+// WEBASSEMBLY64: define void @complex_double(ptr
+// EXPERIMENTAL-MV: define void @complex_double(double {{.*}}, double {{.*}})
+void complex_double(_Complex double a) {
+ // ..
+}
|
Contributor
Author
|
I've confirmed that this fixes the crash in #153567 as well |
dschuff
approved these changes
Jun 4, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This fixes a crash in Clang when the
experimental-mvABI is used on WebAssembly targets in conjunction with complex numbers as arguments. There's no strict definition for what the multivalue ABI is at this time, so the main goal is to just not crash for now.Closes #70402
Closes #153567