[Omit needless words] Properly compute context names for ObjC protocols.

Author: DougGregor

lib/ClangImporter/ClangImporter.cpp

@@ -1927,18 +1927,6 @@ namespace llvm {
 /// printing.
 static StringRef getClangDeclContextName(const clang::DeclContext *dc) {
   auto type = ClangImporter::Implementation::getClangDeclContextType(dc);
-
-  // FIXME: Hack to work around getClangDeclContextType() failing for
-  // protocols.
-  if (type.isNull()) {
-    if (auto constProto = dyn_cast<clang::ObjCProtocolDecl>(dc)) {
-      auto proto = const_cast<clang::ObjCProtocolDecl *>(constProto);
-      clang::ASTContext &ctx = dc->getParentASTContext();
-      type = ctx.getObjCObjectType(ctx.ObjCBuiltinIdTy, { }, { proto }, false);
-      type = ctx.getObjCObjectPointerType(type);
-    }
-  }
-
   if (type.isNull()) return StringRef();
 
   return ClangImporter::Implementation::getClangTypeNameForOmission(

lib/ClangImporter/ImportType.cpp

@@ -1867,6 +1867,13 @@ clang::QualType ClangImporter::Implementation::getClangDeclContextType(
                objcCategory->getClassInterface()));
   }
 
+  if (auto constProto = dyn_cast<clang::ObjCProtocolDecl>(dc)) {
+    auto proto = const_cast<clang::ObjCProtocolDecl *>(constProto);
+    auto type = ctx.getObjCObjectType(ctx.ObjCBuiltinIdTy, { }, { proto },
+                                      false);
+    return ctx.getObjCObjectPointerType(type);
+  }
+
   if (auto tag = dyn_cast<clang::TagDecl>(dc)) {
     return ctx.getTagDeclType(tag);
   }

test/IDE/Inputs/custom-modules/OmitNeedlessWords.h

@@ -32,6 +32,10 @@
 -(void)drawGreebies:(nonnull SEGreebieArray*)greebies;
 @end
 
+@protocol OMWLanding
+-(void)flipLanding;
+@end
+
 @protocol OMWWiggle
 -(void)joinSub;
 -(void)conflicting1 NS_SWIFT_NAME(wiggle1());

test/IDE/print_omit_needless_words.swift

@@ -309,6 +309,10 @@
 // Non-parameterized Objective-C class ending in "Array".
 // CHECK-OMIT-NEEDLESS-WORDS: func draw(_: SEGreebieArray)
 
+// Protocols as contexts
+// CHECK-OMIT-NEEDLESS-WORDS: protocol OMWLanding {
+// CHECK-OMIT-NEEDLESS-WORDS-NEXT: func flip()
+
 // Verify that we get the Swift name from the original declaration.
 // CHECK-OMIT-NEEDLESS-WORDS: protocol OMWWiggle
 // CHECK-OMIT-NEEDLESS-WORDS-NEXT: func joinSub()