[llvm-branch-commits] [cfe-branch] r182381 - Reverting r182337, which merged r182266, __declspec(selectany)
Reid Kleckner
reid at kleckner.net
Tue May 21 06:48:39 PDT 2013
Author: rnk
Date: Tue May 21 08:48:39 2013
New Revision: 182381
URL: http://llvm.org/viewvc/llvm-project?rev=182381&view=rev
Log:
Reverting r182337, which merged r182266, __declspec(selectany)
Was "Implement __declspec(selectany) under -fms-extensions ..."
Removed:
cfe/branches/release_33/test/SemaCXX/attr-selectany.cpp
Modified:
cfe/branches/release_33/ (props changed)
cfe/branches/release_33/include/clang/Basic/Attr.td
cfe/branches/release_33/include/clang/Basic/DiagnosticSemaKinds.td
cfe/branches/release_33/lib/CodeGen/CodeGenModule.cpp
cfe/branches/release_33/lib/Sema/SemaDecl.cpp
cfe/branches/release_33/lib/Sema/SemaDeclAttr.cpp
cfe/branches/release_33/test/CodeGen/ms-declspecs.c
Propchange: cfe/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 21 08:48:39 2013
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:181283,181286,181299,181342,181368,181465,181487,181728,181750,181909,182072,182266
+/cfe/trunk:181283,181286,181299,181342,181368,181465,181487,181728,181750,181909,182072
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_33/include/clang/Basic/Attr.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_33/include/clang/Basic/Attr.td?rev=182381&r1=182380&r2=182381&view=diff
==============================================================================
--- cfe/branches/release_33/include/clang/Basic/Attr.td (original)
+++ cfe/branches/release_33/include/clang/Basic/Attr.td Tue May 21 08:48:39 2013
@@ -948,10 +948,6 @@ def ForceInline : InheritableAttr {
let Spellings = [Keyword<"__forceinline">];
}
-def SelectAny : InheritableAttr {
- let Spellings = [Declspec<"selectany">];
-}
-
def Win64 : InheritableAttr {
let Spellings = [Keyword<"__w64">];
}
Modified: cfe/branches/release_33/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_33/include/clang/Basic/DiagnosticSemaKinds.td?rev=182381&r1=182380&r2=182381&view=diff
==============================================================================
--- cfe/branches/release_33/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/branches/release_33/include/clang/Basic/DiagnosticSemaKinds.td Tue May 21 08:48:39 2013
@@ -1948,8 +1948,6 @@ def warn_weak_identifier_undeclared : Wa
"weak identifier %0 never declared">;
def err_attribute_weak_static : Error<
"weak declaration cannot have internal linkage">;
-def err_attribute_selectany_non_extern_data : Error<
- "'selectany' can only be applied to data items with external linkage">;
def warn_attribute_weak_import_invalid_on_definition : Warning<
"'weak_import' attribute cannot be specified on a definition">,
InGroup<IgnoredAttributes>;
Modified: cfe/branches/release_33/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_33/lib/CodeGen/CodeGenModule.cpp?rev=182381&r1=182380&r2=182381&view=diff
==============================================================================
--- cfe/branches/release_33/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/branches/release_33/lib/CodeGen/CodeGenModule.cpp Tue May 21 08:48:39 2013
@@ -1900,13 +1900,7 @@ CodeGenModule::GetLLVMLinkageVarDefiniti
return llvm::Function::DLLImportLinkage;
else if (D->hasAttr<DLLExportAttr>())
return llvm::Function::DLLExportLinkage;
- else if (D->hasAttr<SelectAnyAttr>()) {
- // selectany symbols are externally visible, so use weak instead of
- // linkonce. MSVC optimizes away references to const selectany globals, so
- // all definitions should be the same and ODR linkage should be used.
- // http://msdn.microsoft.com/en-us/library/5tkz6s71.aspx
- return llvm::GlobalVariable::WeakODRLinkage;
- } else if (D->hasAttr<WeakAttr>()) {
+ else if (D->hasAttr<WeakAttr>()) {
if (GV->isConstant())
return llvm::GlobalVariable::WeakODRLinkage;
else
Modified: cfe/branches/release_33/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_33/lib/Sema/SemaDecl.cpp?rev=182381&r1=182380&r2=182381&view=diff
==============================================================================
--- cfe/branches/release_33/lib/Sema/SemaDecl.cpp (original)
+++ cfe/branches/release_33/lib/Sema/SemaDecl.cpp Tue May 21 08:48:39 2013
@@ -4638,15 +4638,6 @@ static void checkAttributesAfterMerging(
ND.dropAttr<WeakRefAttr>();
}
}
-
- // 'selectany' only applies to externally visible varable declarations.
- // It does not apply to functions.
- if (SelectAnyAttr *Attr = ND.getAttr<SelectAnyAttr>()) {
- if (isa<FunctionDecl>(ND) || !ND.isExternallyVisible()) {
- S.Diag(Attr->getLocation(), diag::err_attribute_selectany_non_extern_data);
- ND.dropAttr<SelectAnyAttr>();
- }
- }
}
/// Given that we are within the definition of the given function,
Modified: cfe/branches/release_33/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_33/lib/Sema/SemaDeclAttr.cpp?rev=182381&r1=182380&r2=182381&view=diff
==============================================================================
--- cfe/branches/release_33/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/branches/release_33/lib/Sema/SemaDeclAttr.cpp Tue May 21 08:48:39 2013
@@ -4683,16 +4683,6 @@ static void handleForceInlineAttr(Sema &
S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName();
}
-static void handleSelectAnyAttr(Sema &S, Decl *D, const AttributeList &Attr) {
- if (!checkMicrosoftExt(S, Attr))
- return;
- // Check linkage after possibly merging declaratinos. See
- // checkAttributesAfterMerging().
- D->addAttr(::new (S.Context)
- SelectAnyAttr(Attr.getRange(), S.Context,
- Attr.getAttributeSpellingListIndex()));
-}
-
//===----------------------------------------------------------------------===//
// Top Level Sema Entry Points
//===----------------------------------------------------------------------===//
@@ -4919,9 +4909,6 @@ static void ProcessInheritableDeclAttr(S
case AttributeList::AT_ForceInline:
handleForceInlineAttr(S, D, Attr);
break;
- case AttributeList::AT_SelectAny:
- handleSelectAnyAttr(S, D, Attr);
- break;
// Thread safety attributes:
case AttributeList::AT_GuardedVar:
Modified: cfe/branches/release_33/test/CodeGen/ms-declspecs.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_33/test/CodeGen/ms-declspecs.c?rev=182381&r1=182380&r2=182381&view=diff
==============================================================================
--- cfe/branches/release_33/test/CodeGen/ms-declspecs.c (original)
+++ cfe/branches/release_33/test/CodeGen/ms-declspecs.c Tue May 21 08:48:39 2013
@@ -1,10 +1,5 @@
// RUN: %clang_cc1 -triple i386-pc-win32 %s -emit-llvm -fms-compatibility -o - | FileCheck %s
-__declspec(selectany) int x1 = 1;
-const __declspec(selectany) int x2 = 2;
-// CHECK: @x1 = weak_odr global i32 1, align 4
-// CHECK: @x2 = weak_odr constant i32 2, align 4
-
struct __declspec(align(16)) S {
char x;
};
Removed: cfe/branches/release_33/test/SemaCXX/attr-selectany.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_33/test/SemaCXX/attr-selectany.cpp?rev=182380&view=auto
==============================================================================
--- cfe/branches/release_33/test/SemaCXX/attr-selectany.cpp (original)
+++ cfe/branches/release_33/test/SemaCXX/attr-selectany.cpp (removed)
@@ -1,33 +0,0 @@
-// RUN: %clang_cc1 -fms-extensions -fsyntax-only -verify %s
-// MSVC produces similar diagnostics.
-
-__declspec(selectany) void foo() { } // expected-error{{'selectany' can only be applied to data items with external linkage}}
-
-__declspec(selectany) int x1 = 1;
-
-const __declspec(selectany) int x2 = 2; // expected-error{{'selectany' can only be applied to data items with external linkage}}
-
-extern const __declspec(selectany) int x3 = 3;
-
-extern const int x4;
-const __declspec(selectany) int x4 = 4;
-
-// MSDN says this is incorrect, but MSVC doesn't diagnose it.
-extern __declspec(selectany) int x5;
-
-static __declspec(selectany) int x6 = 2; // expected-error{{'selectany' can only be applied to data items with external linkage}}
-
-// FIXME: MSVC accepts this and makes x7 externally visible and comdat, but keep
-// it as internal and not weak/linkonce.
-static int x7; // expected-note{{previous definition}}
-extern __declspec(selectany) int x7; // expected-warning{{attribute declaration must precede definition}}
-
-int asdf() { return x7; }
-
-class X {
- public:
- X(int i) { i++; };
- int i;
-};
-
-__declspec(selectany) X x(1);
More information about the llvm-branch-commits
mailing list