RIscRIpt updated this revision to Diff 553122.
RIscRIpt marked an inline comment as done.
RIscRIpt added a comment.
Rebase onto main, address review comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D158591/new/
https://reviews.llvm.org/D158591
Files:
clang/include/clang/Sema/Sema.h
clang/lib/AST/ExprConstant.cpp
clang/lib/Sema/Sema.cpp
clang/lib/Sema/SemaExpr.cpp
clang/test/Sema/ms_predefined_expr.cpp
Index: clang/test/Sema/ms_predefined_expr.cpp
===================================================================
--- clang/test/Sema/ms_predefined_expr.cpp
+++ clang/test/Sema/ms_predefined_expr.cpp
@@ -168,3 +168,40 @@
void test_char_injection(decltype(sizeof('"')), decltype(sizeof("()"))) {
unused("" __FUNCSIG__); // expected-warning{{expansion of predefined identifier '__FUNCSIG__' to a string literal is a Microsoft extension}}
}
+
+void test_in_struct_init() {
+ struct {
+ char F[sizeof(__FUNCTION__)];
+ } s1 = { __FUNCTION__ }; // expected-warning{{initializing an array from a '__FUNCTION__' predefined identifier is a Microsoft extension}}
+
+ struct {
+ char F[sizeof("F:" __FUNCTION__)]; // expected-warning{{expansion of predefined identifier '__FUNCTION__' to a string literal is a Microsoft extension}}
+ } s2 = { "F:" __FUNCTION__ }; // expected-warning{{expansion of predefined identifier '__FUNCTION__' to a string literal is a Microsoft extension}}
+
+ class C {
+ public:
+ struct {
+ char F[sizeof(__FUNCTION__)];
+ } s;
+ } c1 = { { __FUNCTION__ } }; // expected-warning{{initializing an array from a '__FUNCTION__' predefined identifier is a Microsoft extension}}
+}
+
+void test_in_constexpr_struct_init() {
+ struct {
+ char F[sizeof(__FUNCTION__)];
+ } constexpr s1 = { __FUNCTION__ }; // expected-warning{{initializing an array from a '__FUNCTION__' predefined identifier is a Microsoft extension}}
+ ASSERT_EQ(__FUNCTION__, s1.F);
+
+ struct {
+ char F[sizeof("F:" __FUNCTION__)]; // expected-warning{{expansion of predefined identifier '__FUNCTION__' to a string literal is a Microsoft extension}}
+ } constexpr s2 = { "F:" __FUNCTION__ }; // expected-warning{{expansion of predefined identifier '__FUNCTION__' to a string literal is a Microsoft extension}}
+ ASSERT_EQ("F:" __FUNCTION__, s2.F); // expected-warning{{expansion of predefined identifier '__FUNCTION__' to a string literal is a Microsoft extension}}
+
+ class C {
+ public:
+ struct {
+ char F[sizeof("F:" __FUNCTION__)]; // expected-warning{{expansion of predefined identifier '__FUNCTION__' to a string literal is a Microsoft extension}}
+ } s;
+ } constexpr c1 = { { "F:" __FUNCTION__ } }; // expected-warning{{expansion of predefined identifier '__FUNCTION__' to a string literal is a Microsoft extension}}
+ ASSERT_EQ("F:" __FUNCTION__, c1.s.F); // expected-warning{{expansion of predefined identifier '__FUNCTION__' to a string literal is a Microsoft extension}}
+}
Index: clang/lib/Sema/SemaExpr.cpp
===================================================================
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -1984,7 +1984,7 @@
// Note: Although function local macros are defined only inside functions,
// we ensure a valid `CurrentDecl` even outside of a function. This allows
// expansion of macros into empty string literals without additional checks.
- Decl *CurrentDecl = getCurLocalScopeDecl();
+ Decl *CurrentDecl = cast_or_null<Decl>(getPredefinedExprDeclContext());
if (!CurrentDecl)
CurrentDecl = Context.getTranslationUnitDecl();
@@ -3705,7 +3705,7 @@
ExprResult Sema::BuildPredefinedExpr(SourceLocation Loc,
PredefinedExpr::IdentKind IK) {
- Decl *currentDecl = getCurLocalScopeDecl();
+ Decl *currentDecl = cast_or_null<Decl>(getPredefinedExprDeclContext());
if (!currentDecl) {
Diag(Loc, diag::ext_predef_outside_function);
currentDecl = Context.getTranslationUnitDecl();
Index: clang/lib/Sema/Sema.cpp
===================================================================
--- clang/lib/Sema/Sema.cpp
+++ clang/lib/Sema/Sema.cpp
@@ -1491,16 +1491,12 @@
return nullptr;
}
-Decl *Sema::getCurLocalScopeDecl() {
- if (const BlockScopeInfo *BSI = getCurBlock())
- return BSI->TheDecl;
- if (const LambdaScopeInfo *LSI = getCurLambda())
- return LSI->CallOperator;
- if (const CapturedRegionScopeInfo *CSI = getCurCapturedRegion())
- return CSI->TheCapturedDecl;
- if (NamedDecl *ND = getCurFunctionOrMethodDecl())
- return ND;
- return nullptr;
+DeclContext *Sema::getPredefinedExprDeclContext() {
+ DeclContext *DC = CurContext;
+ while (DC && !isa<BlockDecl>(DC) && !isa<CapturedDecl>(DC) &&
+ !isa<FunctionDecl>(DC) && !isa<ObjCMethodDecl>(DC))
+ DC = DC->getParent();
+ return DC;
}
LangAS Sema::getDefaultCXXMethodAddrSpace() const {
Index: clang/lib/AST/ExprConstant.cpp
===================================================================
--- clang/lib/AST/ExprConstant.cpp
+++ clang/lib/AST/ExprConstant.cpp
@@ -7524,6 +7524,9 @@
return Error(E);
}
+ bool VisitPredefinedExpr(const PredefinedExpr *E) {
+ return StmtVisitorTy::Visit(E->getFunctionName());
+ }
bool VisitConstantExpr(const ConstantExpr *E) {
if (E->hasAPValueResult())
return DerivedSuccess(E->getAPValueResult(), E);
Index: clang/include/clang/Sema/Sema.h
===================================================================
--- clang/include/clang/Sema/Sema.h
+++ clang/include/clang/Sema/Sema.h
@@ -3614,9 +3614,10 @@
/// in a 'block', this returns the containing context.
NamedDecl *getCurFunctionOrMethodDecl() const;
- /// getCurLocalScopeDecl - Return the Decl for either of:
- /// block, lambda, captured statement, function, or nullptr.
- Decl *getCurLocalScopeDecl();
+ /// Returns the current DeclContext that can be used to determine the value
+ /// for PredefinedExpr. This can be either a block, lambda, captured
+ /// statement, function, otherwise a nullptr.
+ DeclContext *getPredefinedExprDeclContext();
/// Add this decl to the scope shadowed decl chains.
void PushOnScopeChains(NamedDecl *D, Scope *S, bool AddToContext = true);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
