[cfe-commits] r124136 - in /cfe/trunk: lib/Sema/TreeTransform.h test/SemaCXX/PR8755.cpp

[Nick Lewycky]

Author: nicholas
Date: Mon Jan 24 13:01:04 2011
New Revision: 124136

URL: http://llvm.org/viewvc/llvm-project?rev=124136&view=rev
Log:
Enhance the diagnostic for referring to a typedef with an elaborated name to be
as useful in a templated context as it is without templates. Fixes PR8755!

Added:
    cfe/trunk/test/SemaCXX/PR8755.cpp
Modified:
    cfe/trunk/lib/Sema/TreeTransform.h

Modified: cfe/trunk/lib/Sema/TreeTransform.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=124136&r1=124135&r2=124136&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/TreeTransform.h (original)
+++ cfe/trunk/lib/Sema/TreeTransform.h Mon Jan 24 13:01:04 2011
@@ -796,9 +796,28 @@
     }
 
     if (!Tag) {
-      // FIXME: Would be nice to highlight just the source range.
-      SemaRef.Diag(IdLoc, diag::err_not_tag_in_scope)
-        << Kind << Id << DC;
+      // Check where the name exists but isn't a tag type and use that to emit
+      // better diagnostics.
+      LookupResult Result(SemaRef, Id, IdLoc, Sema::LookupTagName);
+      SemaRef.LookupQualifiedName(Result, DC);
+      switch (Result.getResultKind()) {
+        case LookupResult::Found:
+        case LookupResult::FoundOverloaded:
+        case LookupResult::FoundUnresolvedValue: {
+	  NamedDecl *SomeDecl = Result.getRepresentativeDecl();
+          unsigned Kind = 0;
+          if (isa<TypedefDecl>(SomeDecl)) Kind = 1;
+          else if (isa<ClassTemplateDecl>(SomeDecl)) Kind = 2;
+          SemaRef.Diag(IdLoc, diag::err_tag_reference_non_tag) << Kind;
+          SemaRef.Diag(SomeDecl->getLocation(), diag::note_declared_at);
+          break;
+	}
+        default:
+          // FIXME: Would be nice to highlight just the source range.
+          SemaRef.Diag(IdLoc, diag::err_not_tag_in_scope)
+            << Kind << Id << DC;
+          break;
+      }
       return QualType();
     }
 

Added: cfe/trunk/test/SemaCXX/PR8755.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/PR8755.cpp?rev=124136&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/PR8755.cpp (added)
+++ cfe/trunk/test/SemaCXX/PR8755.cpp Mon Jan 24 13:01:04 2011
@@ -0,0 +1,16 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+template <typename T>
+struct A {
+  typedef int iterator;  // expected-note{{declared here}}
+};
+
+template <typename T>
+void f() {
+  class A <T> ::iterator foo;  // expected-error{{elaborated type refers to a typedef}}
+}
+
+void g() {
+  f<int>();  // expected-note{{in instantiation of function template}}
+}
+