commit 1644360a5795ace4ff2cc15db4b1ff5669690b17
author Fariborz Jahanian <fjahanian@apple.com> Sat Jun 20 20:23:38 2009 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Sat Jun 20 20:23:38 2009 +0000
tree 813eee4f175f87aca443f624adfb07d3f699fc9e
parent 219f3402cfbe84eac700c6908202f8952a258475

Made improvements in c++'s object model patch on Doug's review.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@73833 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaDeclCXX.cpp

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 7524cbf..6d740eb 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -1866,9 +1866,10 @@
       }
       else {
         Diag(CurrentLocation, diag::err_defining_default_ctor) 
-          << ClassDecl->getNameAsCString() << BaseClassDecl->getNameAsCString();
-        Diag(BaseClassDecl->getLocation(), diag::not_previous_class_decl) 
-              << BaseClassDecl->getNameAsCString();
+          << Context.getTagDeclType(ClassDecl) << 1 
+          << Context.getTagDeclType(BaseClassDecl);
+        Diag(BaseClassDecl->getLocation(), diag::note_previous_class_decl) 
+              << Context.getTagDeclType(BaseClassDecl);
         err = true;
       }
     }
@@ -1890,22 +1891,22 @@
         }
         else {
           Diag(CurrentLocation, diag::err_defining_default_ctor) 
-          << ClassDecl->getNameAsCString() << 
-              FieldClassDecl->getNameAsCString();
-          Diag(FieldClassDecl->getLocation(), diag::not_previous_class_decl) 
-          << FieldClassDecl->getNameAsCString();
+          << Context.getTagDeclType(ClassDecl) << 0 <<
+              Context.getTagDeclType(FieldClassDecl);
+          Diag(FieldClassDecl->getLocation(), diag::note_previous_class_decl) 
+          << Context.getTagDeclType(FieldClassDecl);
           err = true;
         }
       }
     else if (FieldType->isReferenceType()) {
       Diag(CurrentLocation, diag::err_unintialized_member) 
-        << ClassDecl->getNameAsCString() << 0;
+        << Context.getTagDeclType(ClassDecl) << 0 << (*Field)->getNameAsCString();
       Diag((*Field)->getLocation(), diag::note_declared_at);
       err = true;
     }
     else if (FieldType.isConstQualified()) {
       Diag(CurrentLocation, diag::err_unintialized_member) 
-        << ClassDecl->getNameAsCString() << 1;
+        << Context.getTagDeclType(ClassDecl) << 1 << (*Field)->getNameAsCString();
        Diag((*Field)->getLocation(), diag::note_declared_at);
       err = true;
     }