[clang] [clang-tools-extra] [CLANGD] Do not crash on designator initialization of union (PR #83369)
via cfe-commits
cfe-commits at lists.llvm.org
Mon Mar 4 11:48:05 PST 2024
https://github.com/alirezamoshtaghi updated https://github.com/llvm/llvm-project/pull/83369
>From 3d6afe011221ac239bb668b375ed3f6c356fc47d Mon Sep 17 00:00:00 2001
From: alirezamoshtaghi <alireza.moshtaghi at gmail.com>
Date: Wed, 28 Feb 2024 13:55:11 -0800
Subject: [PATCH] [CLANGD] Do not crash on designator initialization of union
---
.../clangd/test/designator_init.test | 31 +++++++++++++++++++
clang/lib/AST/Expr.cpp | 14 +++++++--
2 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 clang-tools-extra/clangd/test/designator_init.test
diff --git a/clang-tools-extra/clangd/test/designator_init.test b/clang-tools-extra/clangd/test/designator_init.test
new file mode 100644
index 00000000000000..739f2bfab54bcf
--- /dev/null
+++ b/clang-tools-extra/clangd/test/designator_init.test
@@ -0,0 +1,31 @@
+//# RUN: rm -rf %t.dir/* && mkdir -p %t.dir
+//# RUN: echo '[{"directory": "%/t.dir", "command": "clang -x c -c %s", "file": "%s"}]' > %t.dir/compile_commands.json
+//# RUN: clangd --compile-commands-dir=%t.dir --check=%s 2>&1 | FileCheck %s
+
+typedef struct S {
+ unsigned char id;
+ union {
+ unsigned int mask;
+ struct {
+ unsigned int unused:10;
+ unsigned int reserved:3;
+ unsigned int rest:19;
+ };
+ };
+} __attribute__((packed)) S_t;
+
+typedef struct H {
+ unsigned char hid;
+ unsigned int val;
+} handler_t;
+
+struct S
+get_foo (handler_t *h)
+{
+ S_t retval =
+ {.id=h->hid,
+ .mask=h->val};
+ return retval;
+}
+
+// CHECK: All checks completed, 0 errors
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
index b4de2155adcebd..33eeeda89fe7a5 100644
--- a/clang/lib/AST/Expr.cpp
+++ b/clang/lib/AST/Expr.cpp
@@ -4601,11 +4601,21 @@ SourceRange DesignatedInitExpr::getDesignatorsSourceRange() const {
SourceLocation DesignatedInitExpr::getBeginLoc() const {
auto *DIE = const_cast<DesignatedInitExpr *>(this);
Designator &First = *DIE->getDesignator(0);
- if (First.isFieldDesignator())
- return GNUSyntax ? First.getFieldLoc() : First.getDotLoc();
+ if (First.isFieldDesignator()) {
+ /* search all designators in case the first one is not
+ initialized */
+ for (unsigned int i=0; i<DIE->size(); i++) {
+ Designator &Des = *DIE->getDesignator(i);
+ SourceLocation retval = GNUSyntax ? Des.getFieldLoc() : Des.getDotLoc();
+ if (!retval.isValid ())
+ continue;
+ return retval;
+ }
+ }
return First.getLBracketLoc();
}
+
SourceLocation DesignatedInitExpr::getEndLoc() const {
return getInit()->getEndLoc();
}
More information about the cfe-commits
mailing list