[SIL] Handle KeyPathComponentKind::Method in helpers.

Author: amritpan

lib/IRGen/GenKeyPath.cpp

@@ -811,7 +811,7 @@ emitKeyPathComponent(IRGenModule &IGM,
         KeyPathComponentHeader::forExternalComponent(externalSubArgs.size())
           .getData());
       auto descriptor = IGM.getAddrOfLLVMVariableOrGOTEquivalent(
-        LinkEntity::forPropertyDescriptor(externalDecl));
+          LinkEntity::forPropertyDescriptor(externalDecl));
       fields.addRelativeAddress(descriptor);
       for (auto *arg : externalSubArgs)
         fields.addRelativeAddress(arg);

lib/SIL/IR/SILInstructions.cpp

@@ -2933,6 +2933,7 @@ bool KeyPathPatternComponent::isComputedSettablePropertyMutating() const {
   switch (getKind()) {
   case Kind::StoredProperty:
   case Kind::GettableProperty:
+  case Kind::Method:
   case Kind::OptionalChain:
   case Kind::OptionalWrap:
   case Kind::OptionalForce:
@@ -2960,6 +2961,7 @@ forEachRefcountableReference(const KeyPathPatternComponent &component,
   case KeyPathPatternComponent::Kind::SettableProperty:
     forFunction(component.getComputedPropertyForSettable());
     LLVM_FALLTHROUGH;
+  case KeyPathPatternComponent::Kind::Method:
   case KeyPathPatternComponent::Kind::GettableProperty:
     forFunction(component.getComputedPropertyForGettable());
 
@@ -3014,7 +3016,8 @@ KeyPathPattern::get(SILModule &M, CanGenericSignature signature,
     case KeyPathPatternComponent::Kind::OptionalForce:
     case KeyPathPatternComponent::Kind::TupleElement:
       break;
-    
+
+    case KeyPathPatternComponent::Kind::Method:
     case KeyPathPatternComponent::Kind::GettableProperty:
     case KeyPathPatternComponent::Kind::SettableProperty:
       for (auto &index : component.getArguments()) {
@@ -3096,7 +3099,8 @@ void KeyPathPattern::Profile(llvm::FoldingSetNodeID &ID,
     case KeyPathPatternComponent::Kind::TupleElement:
       ID.AddInteger(component.getTupleIndex());
       break;
-    
+
+    case KeyPathPatternComponent::Kind::Method:
     case KeyPathPatternComponent::Kind::SettableProperty:
       ID.AddPointer(component.getComputedPropertyForSettable());
       LLVM_FALLTHROUGH;
@@ -3221,7 +3225,8 @@ visitReferencedFunctionsAndMethods(
   case KeyPathPatternComponent::Kind::SettableProperty:
     functionCallBack(getComputedPropertyForSettable());
     LLVM_FALLTHROUGH;
-  case KeyPathPatternComponent::Kind::GettableProperty: {
+  case KeyPathPatternComponent::Kind::GettableProperty:
+  case KeyPathPatternComponent::Kind::Method: {
     functionCallBack(getComputedPropertyForGettable());
     auto id = getComputedPropertyId();
     switch (id.getKind()) {

lib/SIL/IR/SILPrinter.cpp

@@ -3099,7 +3099,8 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
       break;
     }
     case KeyPathPatternComponent::Kind::GettableProperty:
-    case KeyPathPatternComponent::Kind::SettableProperty: {
+    case KeyPathPatternComponent::Kind::SettableProperty:
+    case KeyPathPatternComponent::Kind::Method: {
       *this << (kind == KeyPathPatternComponent::Kind::GettableProperty
                   ? "gettable_property $" : "settable_property $")
             << component.getComponentType() << ", "

lib/SIL/Verifier/SILVerifier.cpp

@@ -394,7 +394,8 @@ void verifyKeyPathComponent(SILModule &M,
   }
 
   case KeyPathPatternComponent::Kind::GettableProperty:
-  case KeyPathPatternComponent::Kind::SettableProperty: {
+  case KeyPathPatternComponent::Kind::SettableProperty:
+  case KeyPathPatternComponent::Kind::Method: {
     if (forPropertyDescriptor) {
       require(component.getArguments().empty() && !component.getIndexEquals() &&
                   !component.getIndexHash(),
@@ -5898,6 +5899,7 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
         switch (component.getKind()) {
         case KeyPathPatternComponent::Kind::GettableProperty:
         case KeyPathPatternComponent::Kind::SettableProperty:
+        case KeyPathPatternComponent::Kind::Method:
           hasIndices = !component.getArguments().empty();
           break;
 

lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -423,6 +423,7 @@ bool swift::tryOptimizeKeypathOffsetOf(ApplyInst *AI,
       break;
     case KeyPathPatternComponent::Kind::GettableProperty:
     case KeyPathPatternComponent::Kind::SettableProperty:
+    case KeyPathPatternComponent::Kind::Method:
       // We cannot predict the offset of fields in resilient types, because it's
       // unknown if a resilient field is a computed or stored property.
       if (component.getExternalDecl())

lib/SILOptimizer/Transforms/AccessEnforcementWMO.cpp

@@ -230,6 +230,7 @@ bool GlobalAccessRemoval::visitInstruction(SILInstruction *I) {
         break;
       case KeyPathPatternComponent::Kind::GettableProperty:
       case KeyPathPatternComponent::Kind::SettableProperty:
+      case KeyPathPatternComponent::Kind::Method:
       case KeyPathPatternComponent::Kind::OptionalChain:
       case KeyPathPatternComponent::Kind::OptionalForce:
       case KeyPathPatternComponent::Kind::OptionalWrap:

lib/SILOptimizer/Utils/KeyPathProjector.cpp

@@ -641,6 +641,7 @@ class CompleteKeyPathProjector : public KeyPathProjector {
             (comp, std::move(parent), loc, builder);
         break;
       case KeyPathPatternComponent::Kind::GettableProperty:
+      case KeyPathPatternComponent::Kind::Method:
         projector = std::make_unique<GettablePropertyProjector>
             (keyPath, comp, std::move(parent), keyPath->getSubstitutions(),
              beginAccess, loc, builder);

lib/Serialization/SerializeSIL.cpp

@@ -902,6 +902,9 @@ SILSerializer::writeKeyPathPatternComponent(
     };
 
   switch (component.getKind()) {
+  case KeyPathPatternComponent::Kind::Method:
+    printf("SerializeSIL:writeKeyPathPatternComponent");
+    break;
   case KeyPathPatternComponent::Kind::StoredProperty:
     handleComponentCommon(KeyPathComponentKindEncoding::StoredProperty);
     ListOfValues.push_back(S.addDeclRef(component.getStoredPropertyDecl()));