llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Qiu Chaofan (ecnelises) <details> <summary>Changes</summary> In non C++ mode, struct definitions does not create a scope for declaration. Fixes #<!-- -->41302 Fixes #<!-- -->44080 --- Full diff: https://github.com/llvm/llvm-project/pull/69432.diff 3 Files Affected: - (modified) clang/lib/Sema/IdentifierResolver.cpp (+3-1) - (modified) clang/test/Sema/nested-redef.c (+5-1) - (modified) clang/test/SemaObjC/ivar-lookup.m (+2-2) ``````````diff diff --git a/clang/lib/Sema/IdentifierResolver.cpp b/clang/lib/Sema/IdentifierResolver.cpp index 98a6f3b45089b3a..2213c3c837243ad 100644 --- a/clang/lib/Sema/IdentifierResolver.cpp +++ b/clang/lib/Sema/IdentifierResolver.cpp @@ -109,7 +109,9 @@ bool IdentifierResolver::isDeclInScope(Decl *D, DeclContext *Ctx, Scope *S, return false; if (Ctx->isFunctionOrMethod() || (S && S->isFunctionPrototypeScope())) { // Ignore the scopes associated within transparent declaration contexts. - while (S->getEntity() && S->getEntity()->isTransparentContext()) + while (S->getEntity() && + (S->getEntity()->isTransparentContext() || + (!LangOpt.CPlusPlus && isa<RecordDecl>(S->getEntity())))) S = S->getParent(); if (S->isDeclScope(D)) diff --git a/clang/test/Sema/nested-redef.c b/clang/test/Sema/nested-redef.c index bbc485936770478..c5a726c30422f98 100644 --- a/clang/test/Sema/nested-redef.c +++ b/clang/test/Sema/nested-redef.c @@ -19,4 +19,8 @@ void f2(void) { struct U u; } - +void f3(void) { + struct G { // expected-note{{previous definition is here}} + struct G {}; // expected-error{{nested redefinition of 'G'}} + }; +} diff --git a/clang/test/SemaObjC/ivar-lookup.m b/clang/test/SemaObjC/ivar-lookup.m index 898ffac99692ced..d88299e58e0f594 100644 --- a/clang/test/SemaObjC/ivar-lookup.m +++ b/clang/test/SemaObjC/ivar-lookup.m @@ -95,11 +95,11 @@ - (int) test union U { __typeof(myStatus) __in; // fails. }; - struct S { + struct S { // expected-note{{previous definition is here}} __typeof(myStatus) __in; // fails. struct S1 { // expected-warning {{declaration does not declare anything}} __typeof(myStatus) __in; // fails. - struct S { // expected-warning {{declaration does not declare anything}} + struct S { // expected-error {{nested redefinition of 'S'}} __typeof(myStatus) __in; // fails. }; }; `````````` </details> https://github.com/llvm/llvm-project/pull/69432 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
