C++: add "thread_local" to "properties:" field instead of recording t…

…he keyword as a part of typeref Signed-off-by: Masatake YAMATO <yamato@redhat.com>
quanhongfei-person · Dec 18, 2022 · 29bcaad · 29bcaad
1 parent f616464
commit 29bcaad
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 2 deletions.
diff --git a/Units/parser-cxx.r/properties-constinit.d/expected.tags b/Units/parser-cxx.r/properties-constinit.d/expected.tags
@@ -1,5 +1,5 @@
 g	input.cc	/^const char *g() { return "dynamic initialization"; }$/;"	f	typeref:typename:const char *
 f	input.cc	/^constexpr const char *f(bool p) { return p ? "constant initializer" : g(); }$/;"	f	typeref:typename:const char *	properties:constexpr
 c	input.cc	/^constinit const char *c = f(true); \/\/ OK$/;"	v	typeref:typename:const char *	properties:constinit
-x	input.cc	/^extern thread_local constinit int x;$/;"	x	typeref:typename:thread_local int	properties:extern,constinit
+x	input.cc	/^extern thread_local constinit int x;$/;"	x	typeref:typename:int	properties:extern,constinit,thread_local
 f	input.cc	/^int f() { return x; } \/\/ no check of a guard variable needed$/;"	f	typeref:typename:int
diff --git a/parsers/cxx/cxx_keyword.c b/parsers/cxx/cxx_keyword.c
@@ -475,7 +475,7 @@ static CXXKeywordDescriptor g_aCXXKeywordTable[] = {
 	{
 		"thread_local",
 		CXXLanguageCPP,
-		CXXKeywordMayAppearInVariableDeclaration
+		CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames
 	},
 	{
 		"throw",

diff --git a/parsers/cxx/cxx_parser_block.c b/parsers/cxx/cxx_parser_block.c
@@ -646,6 +646,10 @@ static bool cxxParserParseBlockInternal(bool bExpectClosingBracket)
 					case CXXKeywordCONSTINIT:
 						g_cxx.uKeywordState |= CXXParserKeywordStateSeenConstinit;
 					break;
+					case CXXKeywordTHREAD_LOCAL:
+						g_cxx.uKeywordState |= CXXParserKeywordStateSeenThreadLocal;
+					break;
+
 					default:
 						if(g_cxx.uKeywordState & CXXParserKeywordStateSeenTypedef)
 						{

diff --git a/parsers/cxx/cxx_parser_internal.h b/parsers/cxx/cxx_parser_internal.h
@@ -290,6 +290,8 @@ typedef enum _CXXParserKeywordState
 	CXXParserKeywordStateSeenConsteval = (1 << 14),
 	// "constinit" has been seen
 	CXXParserKeywordStateSeenConstinit = (1 << 15),
+	// "thread_local" has been seen
+	CXXParserKeywordStateSeenThreadLocal = (1 << 16),
 } CXXParserKeywordState;
 
 #define CXX_PARSER_MAXIMUM_NESTING_LEVELS 1024

diff --git a/parsers/cxx/cxx_parser_variable.c b/parsers/cxx/cxx_parser_variable.c
@@ -762,6 +762,8 @@ bool cxxParserExtractVariableDeclarations(CXXTokenChain * pChain,unsigned int uF
 				if(g_cxx.uKeywordState & CXXParserKeywordStateSeenConstinit)
 					uProperties |= CXXTagPropertyConstinit;
 				// consteval is not here; it is for functions.
+				if(g_cxx.uKeywordState & CXXParserKeywordStateSeenThreadLocal)
+					uProperties |= CXXTagPropertyThreadLocal;
 
 				pszProperties = cxxTagSetProperties(uProperties);
 			}

diff --git a/parsers/cxx/cxx_tag.c b/parsers/cxx/cxx_tag.c
@@ -376,6 +376,8 @@ vString * cxxTagSetProperties(unsigned int uProperties)
 		ADD_PROPERTY("consteval");
 	if (uProperties & CXXTagPropertyConstinit)
 		ADD_PROPERTY("constinit");
+	if (uProperties & CXXTagPropertyThreadLocal)
+		ADD_PROPERTY("thread_local");
 
 	cxxTagSetField(CXXTagFieldProperties,vStringValue(pszProperties),false);
 

diff --git a/parsers/cxx/cxx_tag.h b/parsers/cxx/cxx_tag.h
@@ -157,6 +157,8 @@ typedef enum _CXXTagProperty
 	CXXTagPropertyConsteval = (1 << 19),
 	// constinit has been seen.
 	CXXTagPropertyConstinit = (1 << 20),
+	// thread_local has been seen.
+	CXXTagPropertyThreadLocal = (1 << 21),
 } CXXTagProperty;
 
 // Set the modifiers field of the tag.