Just because a declaration has the same name as its containing class doesn't mean that it's a constructor. Fixes rdar://problem/6815988.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70436 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index ec8923a..59e9ed6 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -1982,16 +1982,7 @@
if (Tok.is(tok::identifier)) {
assert(Tok.getIdentifierInfo() && "Not an identifier?");
-
- // If this identifier is the name of the current class, it's a
- // constructor name.
- if (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());
+ D.SetIdentifier(Tok.getIdentifierInfo(), Tok.getLocation());
ConsumeToken();
goto PastIdentifier;
} else if (Tok.is(tok::annot_template_id)) {
@@ -2101,6 +2092,15 @@
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/test/SemaCXX/constructor.cpp b/test/SemaCXX/constructor.cpp
index eae5146..1429cc6 100644
--- a/test/SemaCXX/constructor.cpp
+++ b/test/SemaCXX/constructor.cpp
@@ -40,3 +40,8 @@
struct Length {
Length l() const { return *this; }
};
+
+// <rdar://problem/6815988>
+struct mmst_reg{
+ char mmst_reg[10];
+};