From 63054b39a27ff333487e88247d495a444838b44a Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sun, 19 Apr 2009 20:27:55 +0000 Subject: [PATCH] Add more thorough/correct checking for invalid __thread specifiers. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69542 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticParseKinds.td | 1 - include/clang/Basic/DiagnosticSemaKinds.td | 9 ++++++ lib/Parse/DeclSpec.cpp | 13 +------- lib/Sema/SemaDecl.cpp | 36 +++++++++++++++++---- 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 5e97faa96d..e5d7a1d1bd 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -35,7 +35,6 @@ def err_invalid_short_spec : Error<"'short %0' is invalid">; def err_invalid_long_spec : Error<"'long %0' is invalid">; def err_invalid_longlong_spec : Error<"'long long %0' is invalid">; def err_invalid_complex_spec : Error<"'_Complex %0' is invalid">; -def err_invalid_thread_spec : Error<"'__thread %0' is invalid">; def ext_ident_list_in_param : Extension< "type-less parameter names in function declaration">; diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 8ee940310b..1c2b0e915c 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -93,6 +93,11 @@ def warn_use_out_of_scope_declaration : Warning< def err_inline_non_function : Error< "'inline' can only appear on functions">; +def err_invalid_thread : Error< + "'__thread' is only allowed on variable declarations">; +def err_thread_non_global : Error< + "'__thread' variables must have global storage">; + /// Built-in functions. def ext_implicit_lib_function_decl : ExtWarn< "implicitly declaring C library function '%0' with type %1">; @@ -743,6 +748,10 @@ def err_static_non_static : Error< "static declaration of %0 follows non-static declaration">; def err_non_static_static : Error< "non-static declaration of %0 follows static declaration">; +def err_non_thread_thread : Error< + "non-thread-local declaration of %0 follows thread-local declaration">; +def err_thread_non_thread : Error< + "thread-local declaration of %0 follows non-thread-local declaration">; def err_redefinition_different_type : Error< "redefinition of %0 with a different type">; def err_redefinition_different_kind : Error< diff --git a/lib/Parse/DeclSpec.cpp b/lib/Parse/DeclSpec.cpp index 40675de989..bcf14d916c 100644 --- a/lib/Parse/DeclSpec.cpp +++ b/lib/Parse/DeclSpec.cpp @@ -94,6 +94,7 @@ const char *DeclSpec::getSpecifierName(DeclSpec::SCS S) { case DeclSpec::SCS_static: return "static"; case DeclSpec::SCS_auto: return "auto"; case DeclSpec::SCS_register: return "register"; + case DeclSpec::SCS_private_extern: return "__private_extern__"; case DeclSpec::SCS_mutable: return "mutable"; } } @@ -345,18 +346,6 @@ void DeclSpec::Finish(Diagnostic &D, Preprocessor &PP) { TypeSpecComplex = TSC_unspecified; } } - - // Verify __thread. - if (SCS_thread_specified) { - if (StorageClassSpec == SCS_unspecified) { - StorageClassSpec = SCS_extern; // '__thread int' -> 'extern __thread int' - } else if (StorageClassSpec != SCS_extern && - StorageClassSpec != SCS_static) { - Diag(D, getStorageClassSpecLoc(), SrcMgr, diag::err_invalid_thread_spec) - << getSpecifierName((SCS)StorageClassSpec); - SCS_thread_specified = false; - } - } // Okay, now we can infer the real type. diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 7ed0e2dd31..90df45a5b2 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -917,6 +917,14 @@ bool Sema::MergeVarDecl(VarDecl *New, Decl *OldD) { return true; } + if (New->isThreadSpecified() && !Old->isThreadSpecified()) { + Diag(New->getLocation(), diag::err_thread_non_thread) << New->getDeclName(); + Diag(Old->getLocation(), diag::note_previous_definition); + } else if (!New->isThreadSpecified() && Old->isThreadSpecified()) { + Diag(New->getLocation(), diag::err_non_thread_thread) << New->getDeclName(); + Diag(Old->getLocation(), diag::note_previous_definition); + } + // Keep a chain of previous declarations. New->setPreviousDeclaration(Old); @@ -962,6 +970,7 @@ Sema::DeclPtrTy Sema::ParsedFreeStandingDeclSpec(Scope *S, DeclSpec &DS) { // FIXME: Error on auto/register at file scope // FIXME: Error on inline/virtual/explicit // FIXME: Error on invalid restrict + // FIXME: Warn on useless __thread // FIXME: Warn on useless const/volatile // FIXME: Warn on useless static/extern/typedef/private_extern/mutable // FIXME: Warn on useless attributes @@ -1551,6 +1560,9 @@ Sema::ActOnTypedefDeclarator(Scope* S, Declarator& D, DeclContext* DC, DiagnoseFunctionSpecifiers(D); + if (D.getDeclSpec().isThreadSpecified()) + Diag(D.getDeclSpec().getThreadSpecLoc(), diag::err_invalid_thread); + TypedefDecl *NewTD = ParseTypedefDecl(S, D, R); if (!NewTD) return 0; @@ -1694,7 +1706,6 @@ Sema::ActOnVariableDeclarator(Scope* S, Declarator& D, DeclContext* DC, DiagnoseFunctionSpecifiers(D); - bool ThreadSpecified = D.getDeclSpec().isThreadSpecified(); if (!DC->isRecord() && S->getFnParent() == 0) { // C99 6.9p2: The storage-class specifiers auto and register shall not // appear in the declaration specifiers in an external declaration. @@ -1719,7 +1730,13 @@ Sema::ActOnVariableDeclarator(Scope* S, Declarator& D, DeclContext* DC, II, R, SC, // FIXME: Move to DeclGroup... D.getDeclSpec().getSourceRange().getBegin()); - NewVD->setThreadSpecified(ThreadSpecified); + + if (D.getDeclSpec().isThreadSpecified()) { + if (NewVD->hasLocalStorage()) + Diag(D.getDeclSpec().getThreadSpecLoc(), diag::err_thread_non_global); + else + NewVD->setThreadSpecified(true); + } // Set the lexical context. If the declarator has a C++ scope specifier, the // lexical context will be different from the semantic context. @@ -1913,6 +1930,9 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, case DeclSpec::SCS_private_extern: SC = FunctionDecl::PrivateExtern;break; } + if (D.getDeclSpec().isThreadSpecified()) + Diag(D.getDeclSpec().getThreadSpecLoc(), diag::err_invalid_thread); + bool isInline = D.getDeclSpec().isInlineSpecified(); bool isVirtual = D.getDeclSpec().isVirtualSpecified(); bool isExplicit = D.getDeclSpec().isExplicitSpecified(); @@ -2683,11 +2703,10 @@ Sema::ActOnParamDeclarator(Scope *S, Declarator &D) { diag::err_invalid_storage_class_in_func_decl); D.getMutableDeclSpec().ClearStorageClassSpecs(); } - if (DS.isThreadSpecified()) { - Diag(DS.getThreadSpecLoc(), - diag::err_invalid_storage_class_in_func_decl); - D.getMutableDeclSpec().ClearStorageClassSpecs(); - } + + if (D.getDeclSpec().isThreadSpecified()) + Diag(D.getDeclSpec().getThreadSpecLoc(), diag::err_invalid_thread); + DiagnoseFunctionSpecifiers(D); // Check that there are no default arguments inside the type of this @@ -3574,6 +3593,9 @@ FieldDecl *Sema::HandleField(Scope *S, RecordDecl *Record, DiagnoseFunctionSpecifiers(D); + if (D.getDeclSpec().isThreadSpecified()) + Diag(D.getDeclSpec().getThreadSpecLoc(), diag::err_invalid_thread); + NamedDecl *PrevDecl = LookupName(S, II, LookupMemberName, true); if (PrevDecl && !isDeclInScope(PrevDecl, Record, S)) PrevDecl = 0; -- 2.40.0