Omit needless words: distinguish class vs. instance properties for pr…

…uning. A class method named "bezierPath" should not prevent "appendBezierPath" from being stripped.
sl2 · Nov 17, 2015 · 0f673f5 · 0f673f5
1 parent 7b93555
commit 0f673f5
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 23 deletions.
diff --git a/include/swift/AST/ASTContext.h b/include/swift/AST/ASTContext.h
@@ -802,11 +802,13 @@ class ASTContext {
                            std::unique_ptr<ArchetypeBuilder> builder);
 
   /// Retrieve the inherited name set for the given class.
-  const InheritedNameSet *getAllPropertyNames(ClassDecl *classDecl);
+  const InheritedNameSet *getAllPropertyNames(ClassDecl *classDecl,
+                                              bool forInstance);
 
   /// Retrieve the inherited name set for the given Objective-C class.
   const InheritedNameSet *getAllPropertyNames(
-                            clang::ObjCInterfaceDecl *classDecl);
+                            clang::ObjCInterfaceDecl *classDecl,
+                            bool forInstance);
 
 private:
   friend class Decl;

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -236,12 +236,12 @@ struct ASTContext::Implementation {
 
   /// The set of property names that show up in the defining module of a
   /// class.
-  llvm::DenseMap<const ClassDecl *, std::unique_ptr<InheritedNameSet>>
-    AllProperties;
+  llvm::DenseMap<std::pair<const ClassDecl *, char>,
+                 std::unique_ptr<InheritedNameSet>> AllProperties;
 
   /// The set of property names that show up in the defining module of
   /// an Objective-C class.
-  llvm::DenseMap<const clang::ObjCInterfaceDecl *,
+  llvm::DenseMap<std::pair<const clang::ObjCInterfaceDecl *, char>,
                  std::unique_ptr<InheritedNameSet>> AllPropertiesObjC;
 
   /// \brief Structure that captures data that is segregated into different
@@ -3514,17 +3514,19 @@ void ASTContext::unregisterLazyArchetype(const ArchetypeType *archetype) {
   Impl.LazyArchetypes.erase(known);
 }
 
-const InheritedNameSet *ASTContext::getAllPropertyNames(ClassDecl *classDecl) {
+const InheritedNameSet *ASTContext::getAllPropertyNames(ClassDecl *classDecl,
+                                                        bool forInstance) {
   // If this class was defined in Objective-C, perform the lookup based on
   // the Objective-C class.
   if (auto objcClass = dyn_cast_or_null<clang::ObjCInterfaceDecl>(
                          classDecl->getClangDecl())) {
     return getAllPropertyNames(
-             const_cast<clang::ObjCInterfaceDecl *>(objcClass));
+             const_cast<clang::ObjCInterfaceDecl *>(objcClass),
+             forInstance);
   }
 
   // If we already have this information, return it.
-  auto known = Impl.AllProperties.find(classDecl);
+  auto known = Impl.AllProperties.find({classDecl, forInstance});
   if (known != Impl.AllProperties.end()) return known->second.get();
 
   // Otherwise, get information from our superclass first.
@@ -3534,19 +3536,21 @@ const InheritedNameSet *ASTContext::getAllPropertyNames(ClassDecl *classDecl) {
   const InheritedNameSet *parentSet = nullptr;
   if (auto superclass = classDecl->getSuperclass()) {
     if (auto superclassDecl = superclass->getClassOrBoundGenericClass()) {
-      parentSet = getAllPropertyNames(superclassDecl);
+      parentSet = getAllPropertyNames(superclassDecl, forInstance);
     }
   }
 
   // Create the set of properties.
   known = Impl.AllProperties.insert(
-            {classDecl, llvm::make_unique<InheritedNameSet>(parentSet) }).first;
+            { std::pair<const ClassDecl *, char>(classDecl, forInstance),
+              llvm::make_unique<InheritedNameSet>(parentSet) }).first;
 
   // Local function to add properties from the given set.
   auto addProperties = [&](DeclRange members) {
     for (auto member : members) {
       auto var = dyn_cast<VarDecl>(member);
       if (!var || var->getName().empty()) continue;
+      if (var->isInstanceMember() != forInstance) continue;
 
       known->second->add(var->getName().str());
     }
@@ -3566,36 +3570,42 @@ const InheritedNameSet *ASTContext::getAllPropertyNames(ClassDecl *classDecl) {
 }
 
 const InheritedNameSet *ASTContext::getAllPropertyNames(
-                          clang::ObjCInterfaceDecl *classDecl) {
+                          clang::ObjCInterfaceDecl *classDecl,
+                          bool forInstance) {
   classDecl = classDecl->getCanonicalDecl();
 
   // If we already have this information, return it.
-  auto known = Impl.AllPropertiesObjC.find(classDecl);
+  auto known = Impl.AllPropertiesObjC.find({classDecl, forInstance});
   if (known != Impl.AllPropertiesObjC.end()) return known->second.get();
 
   // Otherwise, get information from our superclass first.
   const InheritedNameSet *parentSet = nullptr;
   if (auto superclassDecl = classDecl->getSuperClass()) {
-    parentSet = getAllPropertyNames(superclassDecl);
+    parentSet = getAllPropertyNames(superclassDecl, forInstance);
   }
 
   // Create the set of properties.
   known = Impl.AllPropertiesObjC.insert(
-            {classDecl, llvm::make_unique<InheritedNameSet>(parentSet) }).first;
+            { std::pair<const clang::ObjCInterfaceDecl *, char>(classDecl,
+                                                                forInstance),
+              llvm::make_unique<InheritedNameSet>(parentSet) }).first;
 
   // Local function to add properties from the given set.
   auto addProperties = [&](clang::DeclContext::decl_range members) {
     for (auto member : members) {
       // Add Objective-C property names.
       if (auto property = dyn_cast<clang::ObjCPropertyDecl>(member)) {
-        known->second->add(property->getName());
+        if (forInstance)
+          known->second->add(property->getName());
         continue;
       }
 
       // Add no-parameter, non-void method names.
       if (auto method = dyn_cast<clang::ObjCMethodDecl>(member)) {
         if (method->getSelector().isUnarySelector() &&
-            !method->getReturnType()->isVoidType()) {
+            !method->getReturnType()->isVoidType() &&
+            !method->hasRelatedResultType() &&
+            method->isInstanceMethod() == forInstance) {
           known->second->add(method->getSelector().getNameForSlot(0));
           continue;
         }

diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -1372,7 +1372,8 @@ ClangImporter::Implementation::importName(const clang::NamedDecl *D,
           if (auto objcPtrType = contextType->getAsObjCInterfacePointerType())
             if (auto objcClassDecl = objcPtrType->getInterfaceDecl())
               allPropertyNames = SwiftContext.getAllPropertyNames(
-                                   objcClassDecl);
+                                   objcClassDecl,
+                                   /*forInstance=*/true);
         }
 
         if (omitNeedlessWords(name, { }, "", propertyTypeName, contextTypeName,

diff --git a/lib/ClangImporter/ImportType.cpp b/lib/ClangImporter/ImportType.cpp
@@ -2036,7 +2036,8 @@ DeclName ClangImporter::Implementation::omitNeedlessWordsInFunctionName(
            const llvm::SmallBitVector &nonNullArgs,
            const Optional<api_notes::ObjCMethodInfo> &knownMethod,
            Optional<unsigned> errorParamIndex,
-           bool returnsSelf) {
+           bool returnsSelf,
+           bool isInstanceMethod) {
   ASTContext &ctx = SwiftContext;
 
   // Collect the argument names.
@@ -2095,7 +2096,8 @@ DeclName ClangImporter::Implementation::omitNeedlessWordsInFunctionName(
   if (!contextType.isNull()) {
     if (auto objcPtrType = contextType->getAsObjCInterfacePointerType())
       if (auto objcClassDecl = objcPtrType->getInterfaceDecl())
-        allPropertyNames = SwiftContext.getAllPropertyNames(objcClassDecl);
+        allPropertyNames = SwiftContext.getAllPropertyNames(objcClassDecl,
+                                                            isInstanceMethod);
   }
 
   if (!omitNeedlessWords(baseName, argNames, firstParamName,
@@ -2303,7 +2305,8 @@ Type ClangImporter::Implementation::importMethodType(
                    nonNullArgs,
                    knownMethod,
                    errorInfo ? Optional<unsigned>(errorInfo->ParamIndex) : None,
-                   clangDecl->hasRelatedResultType());
+                   clangDecl->hasRelatedResultType(),
+                   clangDecl->isInstanceMethod());
   }
 
   // Import the parameters.

diff --git a/lib/ClangImporter/ImporterImpl.h b/lib/ClangImporter/ImporterImpl.h
@@ -707,7 +707,8 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
              const llvm::SmallBitVector &nonNullArgs,
              const Optional<api_notes::ObjCMethodInfo> &knownMethod,
              Optional<unsigned> errorParamIndex,
-             bool returnsSelf);
+             bool returnsSelf,
+             bool isInstanceMethod);
 
   /// \brief Converts the given Swift identifier for Clang.
   clang::DeclarationName exportName(Identifier name);

diff --git a/lib/Sema/MiscDiagnostics.cpp b/lib/Sema/MiscDiagnostics.cpp
@@ -1901,7 +1901,8 @@ static Optional<DeclName> omitNeedlessWords(AbstractFunctionDecl *afd) {
   const InheritedNameSet *allPropertyNames = nullptr;
   if (contextType) {
     if (auto classDecl = contextType->getClassOrBoundGenericClass()) {
-      allPropertyNames = Context.getAllPropertyNames(classDecl);
+      allPropertyNames = Context.getAllPropertyNames(classDecl,
+                                                     afd->isInstanceMember());
     }
   }
 
@@ -1967,7 +1968,8 @@ static Optional<Identifier> omitNeedlessWords(VarDecl *var) {
   const InheritedNameSet *allPropertyNames = nullptr;
   if (contextType) {
     if (auto classDecl = contextType->getClassOrBoundGenericClass()) {
-      allPropertyNames = Context.getAllPropertyNames(classDecl);
+      allPropertyNames = Context.getAllPropertyNames(classDecl,
+                                                     var->isInstanceMember());
     }
   }
 

diff --git a/test/IDE/print_omit_needless_words.swift b/test/IDE/print_omit_needless_words.swift
@@ -203,3 +203,5 @@
 // CHECK-APPKIT: func removeGestureRecognizer(_: NSGestureRecognizer)
 // CHECK-APPKIT: func favoriteViewFor(_: NSGestureRecognizer) -> NSView?
 // CHECK-APPKIT: func addLayoutConstraints(_: Set<NSLayoutConstraint>)
+// CHECK-APPKIT: func add(_: NSRect)
+// CHECK-APPKIT: class func conjureRect(_: NSRect)
diff --git a/test/Inputs/clang-importer-sdk/usr/include/AppKit.h b/test/Inputs/clang-importer-sdk/usr/include/AppKit.h
@@ -293,4 +293,8 @@ typedef NSPoint *NSPointPointer;
 
 - (nonnull NSSet<NSLayoutConstraint *> *)layoutConstraints;
 - (void)addLayoutConstraints:(nonnull NSSet<NSLayoutConstraint *> *)layoutConstraints;
+
++ (NSRect)rect;
+- (void)addRect:(NSRect)rect;
++ (void)conjureRect:(NSRect)rect;
 @end