Generalize printing of nested-name-specifier sequences for use in both
QualifiedNameType and QualifiedDeclRefExpr. We now keep track of the
exact nested-name-specifier spelling for a QualifiedDeclRefExpr, and
use that spelling when printing ASTs. This fixes PR3493.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67283 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp
index 1d4a3ba..f18a288 100644
--- a/lib/AST/ExprCXX.cpp
+++ b/lib/AST/ExprCXX.cpp
@@ -24,6 +24,31 @@
C.Deallocate(this);
}
+QualifiedDeclRefExpr::QualifiedDeclRefExpr(NamedDecl *d, QualType t,
+ SourceLocation l, bool TD,
+ bool VD, SourceRange R,
+ const NestedNameSpecifier *Components,
+ unsigned NumComponents)
+ : DeclRefExpr(QualifiedDeclRefExprClass, d, t, l, TD, VD),
+ QualifierRange(R), NumComponents(NumComponents) {
+ NestedNameSpecifier *Data
+ = reinterpret_cast<NestedNameSpecifier *>(this + 1);
+ for (unsigned I = 0; I < NumComponents; ++I)
+ Data[I] = Components[I];
+}
+
+QualifiedDeclRefExpr *
+QualifiedDeclRefExpr::Create(ASTContext &Context, NamedDecl *d, QualType t,
+ SourceLocation l, bool TD,
+ bool VD, SourceRange R,
+ const NestedNameSpecifier *Components,
+ unsigned NumComponents) {
+ void *Mem = Context.Allocate((sizeof(QualifiedDeclRefExpr) +
+ sizeof(NestedNameSpecifier) * NumComponents));
+ return new (Mem) QualifiedDeclRefExpr(d, t, l, TD, VD, R, Components,
+ NumComponents);
+}
+
//===----------------------------------------------------------------------===//
// Child Iterators for iterating over subexpressions/substatements
//===----------------------------------------------------------------------===//
diff --git a/lib/AST/NestedNameSpecifier.cpp b/lib/AST/NestedNameSpecifier.cpp
index 318c05f..ea4b506 100644
--- a/lib/AST/NestedNameSpecifier.cpp
+++ b/lib/AST/NestedNameSpecifier.cpp
@@ -15,6 +15,8 @@
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
#include "clang/AST/Type.h"
+#include "llvm/Support/raw_ostream.h"
+
using namespace clang;
DeclContext *
@@ -32,3 +34,28 @@
assert(TagT && "No DeclContext from a non-tag type");
return TagT->getDecl();
}
+
+void NestedNameSpecifier::Print(llvm::raw_ostream &OS,
+ const NestedNameSpecifier *First,
+ const NestedNameSpecifier *Last) {
+ for (; First != Last; ++First) {
+ if (Type *T = First->getAsType()) {
+ std::string TypeStr;
+
+ // If this is a qualified name type, suppress the qualification:
+ // it's part of our nested-name-specifier sequence anyway.
+ if (const QualifiedNameType *QualT = dyn_cast<QualifiedNameType>(T))
+ T = QualT->getNamedType().getTypePtr();
+
+ if (const TagType *TagT = dyn_cast<TagType>(T))
+ TagT->getAsStringInternal(TypeStr, true);
+ else
+ T->getAsStringInternal(TypeStr);
+ OS << TypeStr;
+ } else if (NamedDecl *NamedDC
+ = dyn_cast_or_null<NamedDecl>(First->getAsDeclContext()))
+ OS << NamedDC->getNameAsString();
+
+ OS << "::";
+ }
+}
diff --git a/lib/AST/StmtPrinter.cpp b/lib/AST/StmtPrinter.cpp
index c52eb7e..3a6a01c 100644
--- a/lib/AST/StmtPrinter.cpp
+++ b/lib/AST/StmtPrinter.cpp
@@ -530,28 +530,10 @@
OS << Node->getDecl()->getNameAsString();
}
-void StmtPrinter::VisitQualifiedDeclRefExpr(QualifiedDeclRefExpr *Node) {
- // FIXME: Should we keep enough information in QualifiedDeclRefExpr
- // to produce the same qualification that the user wrote?
- llvm::SmallVector<DeclContext *, 4> Contexts;
-
+void StmtPrinter::VisitQualifiedDeclRefExpr(QualifiedDeclRefExpr *Node) {
NamedDecl *D = Node->getDecl();
- // Build up a stack of contexts.
- DeclContext *Ctx = D->getDeclContext();
- for (; Ctx; Ctx = Ctx->getParent())
- if (!Ctx->isTransparentContext())
- Contexts.push_back(Ctx);
-
- while (!Contexts.empty()) {
- DeclContext *Ctx = Contexts.back();
- if (isa<TranslationUnitDecl>(Ctx))
- OS << "::";
- else if (NamedDecl *ND = dyn_cast<NamedDecl>(Ctx))
- OS << ND->getNameAsString() << "::";
- Contexts.pop_back();
- }
-
+ NestedNameSpecifier::Print(OS, Node->begin(), Node->end());
OS << D->getNameAsString();
}
diff --git a/lib/AST/StmtSerialization.cpp b/lib/AST/StmtSerialization.cpp
index 78366a1..5184311 100644
--- a/lib/AST/StmtSerialization.cpp
+++ b/lib/AST/StmtSerialization.cpp
@@ -1589,7 +1589,8 @@
void QualifiedDeclRefExpr::EmitImpl(llvm::Serializer& S) const {
DeclRefExpr::EmitImpl(S);
- S.Emit(NestedNameLoc);
+ S.Emit(QualifierRange);
+ // FIXME: Serialize nested-name-specifiers
}
QualifiedDeclRefExpr*
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index b066802..1fb1e99 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -18,7 +18,7 @@
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/Expr.h"
#include "llvm/ADT/StringExtras.h"
-
+#include "llvm/Support/raw_ostream.h"
using namespace clang;
bool QualType::isConstant(ASTContext &Ctx) const {
@@ -549,13 +549,12 @@
}
const ClassTemplateSpecializationType *
-Type::getClassTemplateSpecializationType() const {
+Type::getAsClassTemplateSpecializationType() const {
// There is no sugar for class template specialization types, so
// just return the canonical type pointer if it is the right class.
return dyn_cast<ClassTemplateSpecializationType>(CanonicalType);
}
-
bool Type::isIntegerType() const {
if (const BuiltinType *BT = dyn_cast<BuiltinType>(CanonicalType))
return BT->getKind() >= BuiltinType::Bool &&
@@ -1438,19 +1437,9 @@
void QualifiedNameType::getAsStringInternal(std::string &InnerString) const {
std::string MyString;
- for (iterator Comp = begin(), CompEnd = end(); Comp != CompEnd; ++Comp) {
- if (Type *T = Comp->getAsType()) {
- std::string TypeStr;
- if (const TagType *TagT = dyn_cast<TagType>(T))
- TagT->getAsStringInternal(TypeStr, true);
- else
- T->getAsStringInternal(TypeStr);
-
- MyString += TypeStr;
- } else if (NamedDecl *NamedDC
- = dyn_cast_or_null<NamedDecl>(Comp->getAsDeclContext()))
- MyString += NamedDC->getNameAsString();
- MyString += "::";
+ {
+ llvm::raw_string_ostream OS(MyString);
+ NestedNameSpecifier::Print(OS, begin(), end());
}
std::string TypeStr;
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index cec94cf..b15f6ab 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -439,11 +439,15 @@
Sema::BuildDeclRefExpr(NamedDecl *D, QualType Ty, SourceLocation Loc,
bool TypeDependent, bool ValueDependent,
const CXXScopeSpec *SS) {
- if (SS && !SS->isEmpty())
- return new (Context) QualifiedDeclRefExpr(D, Ty, Loc, TypeDependent,
- ValueDependent,
- SS->getRange().getBegin());
- else
+ if (SS && !SS->isEmpty()) {
+ llvm::SmallVector<NestedNameSpecifier, 16> Specs;
+ for (CXXScopeSpec::iterator Spec = SS->begin(), SpecEnd = SS->end();
+ Spec != SpecEnd; ++Spec)
+ Specs.push_back(NestedNameSpecifier::getFromOpaquePtr(*Spec));
+ return QualifiedDeclRefExpr::Create(Context, D, Ty, Loc, TypeDependent,
+ ValueDependent, SS->getRange(),
+ &Specs[0], Specs.size());
+ } else
return new (Context) DeclRefExpr(D, Ty, Loc, TypeDependent, ValueDependent);
}
@@ -2226,10 +2230,12 @@
Expr *NewFn = 0;
if (QualifiedDeclRefExpr *QDRExpr
= dyn_cast_or_null<QualifiedDeclRefExpr>(DRExpr))
- NewFn = new (Context) QualifiedDeclRefExpr(FDecl, FDecl->getType(),
- QDRExpr->getLocation(),
- false, false,
- QDRExpr->getSourceRange().getBegin());
+ NewFn = QualifiedDeclRefExpr::Create(Context, FDecl, FDecl->getType(),
+ QDRExpr->getLocation(),
+ false, false,
+ QDRExpr->getQualifierRange(),
+ QDRExpr->begin(),
+ QDRExpr->size());
else
NewFn = new (Context) DeclRefExpr(FDecl, FDecl->getType(),
Fn->getSourceRange().getBegin());