aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/clang/AST/Decl.h17
-rw-r--r--include/clang/Basic/DiagnosticSemaKinds.td4
-rw-r--r--include/clang/Parse/AttributeList.h1
-rw-r--r--lib/AST/Decl.cpp1
-rw-r--r--lib/Basic/Targets.cpp2
-rw-r--r--lib/Frontend/PCHReaderDecl.cpp1
-rw-r--r--lib/Frontend/PCHWriterDecl.cpp1
-rw-r--r--lib/Parse/AttributeList.cpp1
-rw-r--r--lib/Sema/SemaDeclAttr.cpp22
-rw-r--r--lib/Sema/SemaLookup.cpp4
-rw-r--r--test/CXX/basic/basic.lookup/basic.lookup.argdep/p2.cpp11
11 files changed, 6 insertions, 59 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 0ed18b0f53..7d5b66e02a 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -1999,11 +1999,6 @@ class RecordDecl : public TagDecl {
/// containing an object.
bool HasObjectMember : 1;
- /// InvisibleToADL - This is true if this struct is invisible to
- /// argument-dependent lookup. Certain builtin types have this
- /// property.
- bool InvisibleToADL : 1;
-
protected:
RecordDecl(Kind DK, TagKind TK, DeclContext *DC,
SourceLocation L, IdentifierInfo *Id,
@@ -2046,18 +2041,6 @@ public:
bool hasObjectMember() const { return HasObjectMember; }
void setHasObjectMember (bool val) { HasObjectMember = val; }
- /// \brief Determines whether this type is invisible to C++
- /// argument-dependent lookup.
- ///
- /// Types with this bit set behave like fundamental types: they are
- /// never associated classes, and they do not add their contexts as
- /// associated namespaces.
- ///
- /// This can be specified in user code as __attribute__((adl_invisible)),
- /// but it's generally better not to.
- bool isInvisibleToADL() const { return InvisibleToADL; }
- void setInvisibleToADL(bool val = true) { InvisibleToADL = val; }
-
/// \brief Determines whether this declaration represents the
/// injected class name.
///
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 1d5e53e9b5..0ba31aee2f 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -884,9 +884,9 @@ def warn_attribute_wrong_decl_type : Warning<
def err_attribute_wrong_decl_type : Error<
"%0 attribute only applies to %select{function|union|"
"variable and function|function or method|parameter|"
- "parameter or Objective-C method|function, method or block|"
+ "parameter or Objective-C method |function, method or block|"
"virtual method or class|function, method, or parameter|class|virtual method"
- "|member|struct or union}1 types">;
+ "|member}1 types">;
def warn_function_attribute_wrong_type : Warning<
"%0 only applies to function types; type here is %1">;
def warn_gnu_inline_attribute_requires_inline : Warning<
diff --git a/include/clang/Parse/AttributeList.h b/include/clang/Parse/AttributeList.h
index 3e8e12ae06..1e6d3ab976 100644
--- a/include/clang/Parse/AttributeList.h
+++ b/include/clang/Parse/AttributeList.h
@@ -115,7 +115,6 @@ public:
AT_weakref,
AT_weak_import,
AT_reqd_wg_size,
- AT_adl_invisible,
IgnoredAttribute,
UnknownAttribute
};
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 09bdc15280..ffdcb471d0 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -1596,7 +1596,6 @@ RecordDecl::RecordDecl(Kind DK, TagKind TK, DeclContext *DC, SourceLocation L,
HasFlexibleArrayMember = false;
AnonymousStructOrUnion = false;
HasObjectMember = false;
- InvisibleToADL = false;
assert(classof(static_cast<Decl*>(this)) && "Invalid Kind!");
}
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 871bac9743..92fd417173 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -1272,7 +1272,7 @@ public:
" unsigned fp_offset;"
" void* overflow_arg_area;"
" void* reg_save_area;"
- "} __attribute__((adl_invisible)) __va_list_tag;"
+ "} __va_list_tag;"
"typedef __va_list_tag __builtin_va_list[1];";
}
diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp
index 8af146d676..1ef0441ebf 100644
--- a/lib/Frontend/PCHReaderDecl.cpp
+++ b/lib/Frontend/PCHReaderDecl.cpp
@@ -171,7 +171,6 @@ void PCHDeclReader::VisitRecordDecl(RecordDecl *RD) {
RD->setHasFlexibleArrayMember(Record[Idx++]);
RD->setAnonymousStructOrUnion(Record[Idx++]);
RD->setHasObjectMember(Record[Idx++]);
- RD->setInvisibleToADL(Record[Idx++]);
}
void PCHDeclReader::VisitValueDecl(ValueDecl *VD) {
diff --git a/lib/Frontend/PCHWriterDecl.cpp b/lib/Frontend/PCHWriterDecl.cpp
index 0ce7d8fcae..cc58e8ee46 100644
--- a/lib/Frontend/PCHWriterDecl.cpp
+++ b/lib/Frontend/PCHWriterDecl.cpp
@@ -169,7 +169,6 @@ void PCHDeclWriter::VisitRecordDecl(RecordDecl *D) {
Record.push_back(D->hasFlexibleArrayMember());
Record.push_back(D->isAnonymousStructOrUnion());
Record.push_back(D->hasObjectMember());
- Record.push_back(D->isInvisibleToADL());
Code = pch::DECL_RECORD;
}
diff --git a/lib/Parse/AttributeList.cpp b/lib/Parse/AttributeList.cpp
index 333a09cac7..1ebff22e44 100644
--- a/lib/Parse/AttributeList.cpp
+++ b/lib/Parse/AttributeList.cpp
@@ -120,7 +120,6 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) {
.Case("cf_returns_retained", AT_cf_returns_retained)
.Case("reqd_work_group_size", AT_reqd_wg_size)
.Case("no_instrument_function", AT_no_instrument_function)
- .Case("adl_invisible", AT_adl_invisible)
.Case("thiscall", AT_thiscall)
.Case("__cdecl", AT_cdecl)
.Case("__stdcall", AT_stdcall)
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index 90d5308168..c6dcc3b97b 100644
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -703,7 +703,7 @@ static void HandleObjCExceptionAttr(Decl *D, const AttributeList &Attr,
static void HandleObjCNSObject(Decl *D, const AttributeList &Attr, Sema &S) {
if (Attr.getNumArgs() != 0) {
- S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0;
+ S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 1;
return;
}
if (TypedefDecl *TD = dyn_cast<TypedefDecl>(D)) {
@@ -720,7 +720,7 @@ static void HandleObjCNSObject(Decl *D, const AttributeList &Attr, Sema &S) {
static void
HandleOverloadableAttr(Decl *D, const AttributeList &Attr, Sema &S) {
if (Attr.getNumArgs() != 0) {
- S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0;
+ S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 1;
return;
}
@@ -732,21 +732,6 @@ HandleOverloadableAttr(Decl *D, const AttributeList &Attr, Sema &S) {
D->addAttr(::new (S.Context) OverloadableAttr());
}
-static void HandleADLInvisibleAttr(Decl *d, const AttributeList &Attr, Sema &S) {
- if (Attr.getNumArgs() != 0) {
- S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0;
- return;
- }
-
- if (!isa<RecordDecl>(d)) {
- S.Diag(Attr.getLoc(), diag::err_attribute_wrong_decl_type)
- << "adl_invisible" << 12;
- return;
- }
-
- cast<RecordDecl>(d)->setInvisibleToADL();
-}
-
static void HandleBlocksAttr(Decl *d, const AttributeList &Attr, Sema &S) {
if (!Attr.getParameterName()) {
S.Diag(Attr.getLoc(), diag::err_attribute_argument_n_not_string)
@@ -956,7 +941,7 @@ static void HandleReqdWorkGroupSize(Decl *D, const AttributeList &Attr,
Sema &S) {
// Attribute has 3 arguments.
if (Attr.getNumArgs() != 3) {
- S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 3;
+ S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 1;
return;
}
@@ -1984,7 +1969,6 @@ static void ProcessDeclAttribute(Scope *scope, Decl *D,
HandleObjCExceptionAttr(D, Attr, S);
break;
case AttributeList::AT_overloadable:HandleOverloadableAttr(D, Attr, S); break;
- case AttributeList::AT_adl_invisible: HandleADLInvisibleAttr(D, Attr, S); break;
case AttributeList::AT_nsobject: HandleObjCNSObject (D, Attr, S); break;
case AttributeList::AT_blocks: HandleBlocksAttr (D, Attr, S); break;
case AttributeList::AT_sentinel: HandleSentinelAttr (D, Attr, S); break;
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 8710c496de..16d7305867 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -1500,10 +1500,6 @@ addAssociatedClassesAndNamespaces(CXXRecordDecl *Class,
ASTContext &Context,
Sema::AssociatedNamespaceSet &AssociatedNamespaces,
Sema::AssociatedClassSet &AssociatedClasses) {
-
- // Some classes are invisible to ADL.
- if (Class->isInvisibleToADL()) return;
-
// C++ [basic.lookup.koenig]p2:
// [...]
// -- If T is a class type (including unions), its associated
diff --git a/test/CXX/basic/basic.lookup/basic.lookup.argdep/p2.cpp b/test/CXX/basic/basic.lookup/basic.lookup.argdep/p2.cpp
index 0c905fbf32..2bdf7cb0d7 100644
--- a/test/CXX/basic/basic.lookup/basic.lookup.argdep/p2.cpp
+++ b/test/CXX/basic/basic.lookup/basic.lookup.argdep/p2.cpp
@@ -97,14 +97,3 @@ namespace test5 {
foo(&bar);
}
}
-
-// PR6762: __builtin_va_list should be invisible to ADL on all platforms.
-void test6_function(__builtin_va_list &argv);
-namespace test6 {
- void test6_function(__builtin_va_list &argv);
-
- void test() {
- __builtin_va_list args;
- test6_function(args);
- }
-}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-08-02 20:04:53 +0000