Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannes Vogt2019-09-20 12:18:38 -0400
committerNathan Ridge2019-09-22 20:14:24 -0400
commit9a6fd2ab976b90a2f41004cfa5c8f716348510d3 (patch)
tree5c92dc39359bb283fc8140a6eb3fbb30e1158136
parent39be625d8e599210130fe8098a018fc62e52ef70 (diff)
downloadorg.eclipse.cdt-9a6fd2ab976b90a2f41004cfa5c8f716348510d3.tar.gz
org.eclipse.cdt-9a6fd2ab976b90a2f41004cfa5c8f716348510d3.tar.xz
org.eclipse.cdt-9a6fd2ab976b90a2f41004cfa5c8f716348510d3.zip
Bug 549362 - Aggregate init for union-like classes
ClassTypeHelper.getDeclaredFields() returns the first field of an anonymous union. Change-Id: I3f33dcdd7b274ffac7aad0b80ea8c523bfd6e5f2 Signed-off-by: Hannes Vogt <hannes@havogt.de>
-rw-r--r--core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java12
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java57
2 files changed, 55 insertions, 14 deletions
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
index 005478412b..40f235a4f4 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
@@ -13393,4 +13393,16 @@ public class AST2CPPTests extends AST2CPPTestBase {
BindingAssertionHelper bh = getAssertionHelper();
bh.assertImplicitName("t{1};", 1, IProblemBinding.class);
}
+
+ // struct MyStruct {
+ // union {
+ // int num;
+ // };
+ // };
+ // int main() {
+ // MyStruct test = { 0 };
+ // }
+ public void testAggregateInitOfAnonymousUnion_549362() throws Exception {
+ parseAndCheckImplicitNameBindings();
+ }
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
index a03884ceac..c8654abdcd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
@@ -239,11 +239,28 @@ public class ClassTypeHelper {
IASTDeclaration[] decls = host.getCompositeTypeSpecifier().getMembers();
for (IASTDeclaration decl : decls) {
if (decl instanceof IASTSimpleDeclaration) {
- IASTDeclarator[] dtors = ((IASTSimpleDeclaration) decl).getDeclarators();
- for (IASTDeclarator dtor : dtors) {
- binding = ASTQueries.findInnermostDeclarator(dtor).getName().resolveBinding();
- if (binding instanceof ICPPField)
- result = ArrayUtil.appendAt(result, resultSize++, (ICPPField) binding);
+ IASTSimpleDeclaration simpleDecl = (IASTSimpleDeclaration) decl;
+ IASTDeclarator[] dtors = simpleDecl.getDeclarators();
+ if (dtors.length == 0) {
+ // check for union-like classes [class.union.anon]
+ ICPPClassType nestedClass = getNestedClass(simpleDecl);
+ if (nestedClass != null && nestedClass.getName().length() == 0) {
+ if (nestedClass.getFields().length > 0) {
+ // TODO(havogt): Here we add only the first field of the anonymous union to the result
+ // (as needed for aggregate initialization, see [dcl.init.aggr](c++17)p.16).
+ // A proper solution will probably need to return a new implementation of ICPPField for anonymous unions.
+ // TODO(havogt): This branch is also taken for anonymous structs (GNU extension), in that case
+ // it should add all fields of the anonymous struct.
+ binding = nestedClass.getFields()[0];
+ result = ArrayUtil.appendAt(result, resultSize++, (ICPPField) binding);
+ }
+ }
+ } else {
+ for (IASTDeclarator dtor : dtors) {
+ binding = ASTQueries.findInnermostDeclarator(dtor).getName().resolveBinding();
+ if (binding instanceof ICPPField)
+ result = ArrayUtil.appendAt(result, resultSize++, (ICPPField) binding);
+ }
}
} else if (decl instanceof ICPPASTUsingDeclaration) {
IASTName n = ((ICPPASTUsingDeclaration) decl).getName();
@@ -260,6 +277,7 @@ public class ClassTypeHelper {
}
}
return ArrayUtil.trim(result, resultSize);
+
}
/**
@@ -551,6 +569,23 @@ public class ClassTypeHelper {
return true;
}
+ /**
+ * @param decl
+ * @return if decl declares a nested class: return the class; else return null.
+ */
+ public static ICPPClassType getNestedClass(IASTSimpleDeclaration decl) {
+ IBinding binding = null;
+ IASTDeclSpecifier declSpec = decl.getDeclSpecifier();
+ if (declSpec instanceof ICPPASTCompositeTypeSpecifier) {
+ binding = ((ICPPASTCompositeTypeSpecifier) declSpec).getName().resolveBinding();
+ } else if (declSpec instanceof ICPPASTElaboratedTypeSpecifier && decl.getDeclarators().length == 0) {
+ binding = ((ICPPASTElaboratedTypeSpecifier) declSpec).getName().resolveBinding();
+ }
+ if (binding instanceof ICPPClassType)
+ return (ICPPClassType) binding;
+ return null;
+ }
+
public static ICPPClassType[] getNestedClasses(ICPPInternalClassTypeMixinHost host) {
if (host.getDefinition() == null) {
host.checkForDefinition();
@@ -571,16 +606,10 @@ public class ClassTypeHelper {
while (decl instanceof ICPPASTTemplateDeclaration)
decl = ((ICPPASTTemplateDeclaration) decl).getDeclaration();
if (decl instanceof IASTSimpleDeclaration) {
- IBinding binding = null;
- IASTDeclSpecifier declSpec = ((IASTSimpleDeclaration) decl).getDeclSpecifier();
- if (declSpec instanceof ICPPASTCompositeTypeSpecifier) {
- binding = ((ICPPASTCompositeTypeSpecifier) declSpec).getName().resolveBinding();
- } else if (declSpec instanceof ICPPASTElaboratedTypeSpecifier
- && ((IASTSimpleDeclaration) decl).getDeclarators().length == 0) {
- binding = ((ICPPASTElaboratedTypeSpecifier) declSpec).getName().resolveBinding();
+ ICPPClassType nestedClass = getNestedClass((IASTSimpleDeclaration) decl);
+ if (nestedClass != null) {
+ result = ArrayUtil.appendAt(result, resultSize++, nestedClass);
}
- if (binding instanceof ICPPClassType)
- result = ArrayUtil.appendAt(result, resultSize++, (ICPPClassType) binding);
}
}
return ArrayUtil.trim(result, resultSize);

Back to the top