commit 7e50826d3559f284eee6659f0aa159c68f504b34
author Douglas Gregor <doug.gregor@gmail.com> Thu Mar 19 03:51:16 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Thu Mar 19 03:51:16 2009 +0000
tree e0207c1035354d16bc45f24a333aeefdecb584be
parent 35b98748ffdc3816b026ac55ec8fc00abed05d96

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

lib/Sema/SemaExpr.cpp

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());