Parsing fix for out-of-line constructors, from Piotr Rak
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74833 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index d599438..5566751 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -2125,8 +2125,9 @@
// constructor name.
if (!D.getDeclSpec().hasTypeSpecifier() &&
Actions.isCurrentClassName(*Tok.getIdentifierInfo(),CurScope)) {
+ CXXScopeSpec *SS = afterCXXScope? &D.getCXXScopeSpec() : 0;
D.setConstructor(Actions.getTypeName(*Tok.getIdentifierInfo(),
- Tok.getLocation(), CurScope),
+ Tok.getLocation(), CurScope, SS),
Tok.getLocation());
// This is a normal identifier.
} else
@@ -2171,7 +2172,8 @@
// FIXME: Inaccurate.
SourceLocation NameLoc = Tok.getLocation();
SourceLocation EndLoc;
- TypeResult Type = ParseClassName(EndLoc);
+ CXXScopeSpec *SS = afterCXXScope? &D.getCXXScopeSpec() : 0;
+ TypeResult Type = ParseClassName(EndLoc, SS);
if (Type.isInvalid())
D.SetIdentifier(0, TildeLoc);
else
diff --git a/test/SemaCXX/constructor.cpp b/test/SemaCXX/constructor.cpp
index 8f289a2..ec28e7e 100644
--- a/test/SemaCXX/constructor.cpp
+++ b/test/SemaCXX/constructor.cpp
@@ -58,3 +58,28 @@
a z; z.b(x);
}
}
+
+namespace A {
+ struct S {
+ S();
+ S(int);
+ void f1();
+ void f2();
+ operator int ();
+ ~S();
+ };
+}
+
+A::S::S() {}
+
+void A::S::f1() {}
+
+struct S {};
+
+A::S::S(int) {}
+
+void A::S::f2() {}
+
+A::S::operator int() { return 1; }
+
+A::S::~S() {}