diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 38bb852..ec950d1 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -564,6 +564,14 @@
         Diag(NameLoc, diag::err_use_of_tag_name_without_tag)
           << Name << TagName << getLangOpts().CPlusPlus
           << FixItHint::CreateInsertion(NameLoc, FixItTagName);
+
+        LookupResult R(*this, Name, NameLoc, LookupOrdinaryName);
+        if (LookupParsedName(R, S, &SS)) {
+          for (LookupResult::iterator I = R.begin(), IEnd = R.end();
+               I != IEnd; ++I)
+            Diag((*I)->getLocation(), diag::note_decl_shadowing_tag_type)
+              << Name << TagName;
+        }
         break;
       }