Rework the way we handle constructor decls to be less hacky and fix PR3948 completely.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70516 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 59e9ed6..8b81c31 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -1982,7 +1982,17 @@
if (Tok.is(tok::identifier)) {
assert(Tok.getIdentifierInfo() && "Not an identifier?");
- D.SetIdentifier(Tok.getIdentifierInfo(), Tok.getLocation());
+
+ // If this identifier is the name of the current class, it's a
+ // constructor name.
+ if (!D.getDeclSpec().hasTypeSpecifier() &&
+ Actions.isCurrentClassName(*Tok.getIdentifierInfo(),CurScope)) {
+ D.setConstructor(Actions.getTypeName(*Tok.getIdentifierInfo(),
+ Tok.getLocation(), CurScope),
+ Tok.getLocation());
+ // This is a normal identifier.
+ } else
+ D.SetIdentifier(Tok.getIdentifierInfo(), Tok.getLocation());
ConsumeToken();
goto PastIdentifier;
} else if (Tok.is(tok::annot_template_id)) {
@@ -2092,15 +2102,6 @@
break;
}
ParseFunctionDeclarator(ConsumeParen(), D);
-
- // If this identifier is the name of the current class, it's a
- // constructor name.
- if (IdentifierInfo *II = D.getIdentifier()) {
- if (Actions.isCurrentClassName(*II, CurScope))
- D.setConstructor(Actions.getTypeName(*II, D.getIdentifierLoc(),
- CurScope),
- D.getIdentifierLoc());
- }
} else if (Tok.is(tok::l_square)) {
ParseBracketDeclarator(D);
} else {
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 2381c62..37f4985 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2035,6 +2035,18 @@
isVirtualOkay = true;
} else if (DC->isRecord()) {
+ // If the of the function is the same as the name of the record, then this
+ // must be an invalid constructor that has a return type.
+ // (The parser checks for a return type and makes the declarator a
+ // constructor if it has no return type).
+ // must have an invalid constructor that has a return type
+ if (Name.getAsIdentifierInfo() == cast<CXXRecordDecl>(DC)->getIdentifier()){
+ Diag(D.getIdentifierLoc(), diag::err_constructor_return_type)
+ << SourceRange(D.getDeclSpec().getTypeSpecTypeLoc())
+ << SourceRange(D.getIdentifierLoc());
+ return 0;
+ }
+
// This is a C++ method declaration.
NewFD = CXXMethodDecl::Create(Context, cast<CXXRecordDecl>(DC),
D.getIdentifierLoc(), Name, R,
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index e9b7fb0..6e00488 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -1294,19 +1294,6 @@
D.setInvalidType();
SC = FunctionDecl::None;
}
- if (D.getDeclSpec().hasTypeSpecifier() && !D.isInvalidType()) {
- // Constructors don't have return types, but the parser will
- // happily parse something like:
- //
- // class X {
- // float X(float);
- // };
- //
- // The return type will be eliminated later.
- Diag(D.getIdentifierLoc(), diag::err_constructor_return_type)
- << SourceRange(D.getDeclSpec().getTypeSpecTypeLoc())
- << SourceRange(D.getIdentifierLoc());
- }
DeclaratorChunk::FunctionTypeInfo &FTI = D.getTypeObject(0).Fun;
if (FTI.TypeQuals != 0) {
diff --git a/test/SemaCXX/constructor.cpp b/test/SemaCXX/constructor.cpp
index 1429cc6..8f289a2 100644
--- a/test/SemaCXX/constructor.cpp
+++ b/test/SemaCXX/constructor.cpp
@@ -45,3 +45,16 @@
struct mmst_reg{
char mmst_reg[10];
};
+
+// PR3948
+namespace PR3948 {
+// PR3948
+class a {
+ public:
+ int b(int a());
+};
+int x();
+void y() {
+ a z; z.b(x);
+}
+}