[AST] Replace FuncDecl::getName & EnumElementDecl::getName with ValueDecl::getBaseIdentifier

AnthonyLatsis · AnthonyLatsis · commit d0ae3ee58087 · 2020-03-29T00:35:51.000+03:00
diff --git a/include/swift/AST/Decl.h b/include/swift/AST/Decl.h
@@ -2496,6 +2496,10 @@ class ValueDecl : public Decl {
   /// names.
   DeclBaseName getBaseName() const { return Name.getBaseName(); }
 
+  Identifier getBaseIdentifier() const {
+    return getFullName().getBaseIdentifier();
+  }
+
   /// Generates a DeclNameRef referring to this declaration with as much
   /// specificity as possible.
   DeclNameRef createNameRef() const {
@@ -6239,8 +6243,6 @@ class FuncDecl : public AbstractFunctionDecl {
                           TypeLoc FnRetType, DeclContext *Parent,
                           ClangNode ClangN = ClangNode());
 
-  Identifier getName() const { return getFullName().getBaseIdentifier(); }
-
   bool isStatic() const;
 
   /// \returns the way 'static'/'class' was spelled in the source.
@@ -6583,8 +6585,6 @@ class EnumElementDecl : public DeclContext, public ValueDecl {
                   LiteralExpr *RawValueExpr,
                   DeclContext *DC);
 
-  Identifier getName() const { return getFullName().getBaseIdentifier(); }
-
   /// Returns the string for the base name, or "_" if this is unnamed.
   StringRef getNameStr() const {
     assert(!getFullName().isSpecial() && "Cannot get string for special names");
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -2613,7 +2613,7 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
   }
   void visitEnumIsCaseExpr(EnumIsCaseExpr *E) {
     printCommon(E, "enum_is_case_expr") << ' ' <<
-      E->getEnumElement()->getName() << "\n";
+      E->getEnumElement()->getBaseIdentifier() << "\n";
     printRec(E->getSubExpr());
     PrintWithColorRAII(OS, ParenthesisColor) << ')';
   }
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -2876,7 +2876,7 @@ void PrintAST::visitFuncDecl(FuncDecl *decl) {
         if (!decl->hasName()) {
           Printer << "<anonymous>";
         } else {
-          Printer.printName(decl->getName(),
+          Printer.printName(decl->getBaseIdentifier(),
                             getTypeMemberPrintNameContext(decl));
           if (decl->isOperator())
             Printer << " ";
@@ -2949,7 +2949,8 @@ void PrintAST::visitFuncDecl(FuncDecl *decl) {
 void PrintAST::printEnumElement(EnumElementDecl *elt) {
   recordDeclLoc(elt,
     [&]{
-      Printer.printName(elt->getName(), getTypeMemberPrintNameContext(elt));
+      Printer.printName(elt->getBaseIdentifier(),
+                        getTypeMemberPrintNameContext(elt));
     });
 
   if (auto *PL = elt->getParameterList()) {
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -6833,7 +6833,7 @@ AbstractFunctionDecl::getObjCSelector(DeclName preferredName,
     return destructor->getObjCSelector();
   } else if (auto func = dyn_cast<FuncDecl>(this)) {
     // Otherwise cast this to be able to access getName()
-    baseNameStr = func->getName().str();
+    baseNameStr = func->getBaseIdentifier().str();
   } else if (isa<ConstructorDecl>(this)) {
     baseNameStr = "init";
   } else {
@@ -7341,7 +7341,8 @@ SelfAccessKind FuncDecl::getSelfAccessKind() const {
 }
 
 bool FuncDecl::isCallAsFunctionMethod() const {
-  return getName() == getASTContext().Id_callAsFunction && isInstanceMember();
+  return getBaseIdentifier() == getASTContext().Id_callAsFunction &&
+         isInstanceMember();
 }
 
 ConstructorDecl::ConstructorDecl(DeclName Name, SourceLoc ConstructorLoc,
@@ -7838,7 +7839,7 @@ PrecedenceGroupDecl *InfixOperatorDecl::getPrecedenceGroup() const {
 }
 
 bool FuncDecl::isDeferBody() const {
-  return getName() == getASTContext().getIdentifier("$defer");
+  return getBaseIdentifier() == getASTContext().getIdentifier("$defer");
 }
 
 bool FuncDecl::isPotentialIBActionTarget() const {
diff --git a/lib/AST/FrontendSourceFileDepGraphFactory.cpp b/lib/AST/FrontendSourceFileDepGraphFactory.cpp
@@ -59,10 +59,6 @@ template <typename DeclT> static std::string getBaseName(const DeclT *decl) {
   return decl->getBaseName().userFacingName().str();
 }
 
-template <typename DeclT> static std::string getName(const DeclT *decl) {
-  return DeclBaseName(decl->getName()).userFacingName().str();
-}
-
 static std::string mangleTypeAsContext(const NominalTypeDecl *NTD) {
   Mangle::ASTMangler Mangler;
   return !NTD ? "" : Mangler.mangleTypeAsContextUSR(NTD);
@@ -188,22 +184,22 @@ std::string
 DependencyKey::computeNameForProvidedEntity<NodeKind::topLevel,
                                             PrecedenceGroupDecl const *>(
     const PrecedenceGroupDecl *D) {
-  return ::getName(D);
+  return D->getName().str().str();
 }
 template <>
 std::string DependencyKey::computeNameForProvidedEntity<
     NodeKind::topLevel, FuncDecl const *>(const FuncDecl *D) {
-  return ::getName(D);
+  return getBaseName(D);
 }
 template <>
 std::string DependencyKey::computeNameForProvidedEntity<
     NodeKind::topLevel, OperatorDecl const *>(const OperatorDecl *D) {
-  return ::getName(D);
+  return D->getName().str().str();
 }
 template <>
 std::string DependencyKey::computeNameForProvidedEntity<
     NodeKind::topLevel, NominalTypeDecl const *>(const NominalTypeDecl *D) {
-  return ::getName(D);
+  return D->getName().str().str();
 }
 template <>
 std::string DependencyKey::computeNameForProvidedEntity<
diff --git a/lib/AST/SwiftNameTranslation.cpp b/lib/AST/SwiftNameTranslation.cpp
@@ -90,7 +90,7 @@ printSwiftEnumElemNameInObjC(const EnumElementDecl *EL, llvm::raw_ostream &OS,
   }
   OS << getNameForObjC(EL->getDeclContext()->getSelfEnumDecl());
   if (PreferredName.empty())
-    ElemName = EL->getName().str();
+    ElemName = EL->getBaseIdentifier().str();
   else
     ElemName = PreferredName.str();
 
diff --git a/lib/FrontendTool/ReferenceDependencies.cpp b/lib/FrontendTool/ReferenceDependencies.cpp
@@ -254,7 +254,7 @@ ProvidesEmitter::emitTopLevelNames() const {
   for (const Decl *D : SF->getTopLevelDecls())
     emitTopLevelDecl(D, cpd);
   for (auto *operatorFunction : cpd.memberOperatorDecls)
-    out << "- \"" << escape(operatorFunction->getName()) << "\"\n";
+    out << "- \"" << escape(operatorFunction->getBaseIdentifier()) << "\"\n";
   return cpd;
 }
 
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
@@ -2177,7 +2177,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
         VD->shouldHideFromEditor())
       return;
 
-    Identifier Name = VD->getName();
+    const Identifier Name = VD->getName();
     assert(!Name.empty() && "name should not be empty");
 
     CommandWordsPairs Pairs;
@@ -2576,11 +2576,11 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
 
   void addMethodCall(const FuncDecl *FD, DeclVisibilityKind Reason,
                      DynamicLookupInfo dynamicLookupInfo) {
-    if (FD->getName().empty())
+    if (FD->getBaseIdentifier().empty())
       return;
     foundFunction(FD);
 
-    Identifier Name = FD->getName();
+    const Identifier Name = FD->getBaseIdentifier();
     assert(!Name.empty() && "name should not be empty");
 
     Type FunctionType = getTypeOfMember(FD, dynamicLookupInfo);
@@ -2944,7 +2944,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     setAssociatedDecl(EED, Builder);
     setClangDeclKeywords(EED, Pairs, Builder);
     addLeadingDot(Builder);
-    addValueBaseName(Builder, EED->getName());
+    addValueBaseName(Builder, EED->getBaseIdentifier());
 
     // Enum element is of function type; (Self.type) -> Self or
     // (Self.Type) -> (Args...) -> Self.
diff --git a/lib/IDE/Refactoring.cpp b/lib/IDE/Refactoring.cpp
@@ -2278,7 +2278,7 @@ isApplicable(ResolvedRangeInfo Info, DiagnosticEngine &Diag) {
     }
 
     bool checkName(FuncDecl *FD) {
-      auto Name = FD->getName().str();
+      const auto Name = FD->getBaseIdentifier().str();
       return Name == "~="
       || Name == "=="
       || Name == "__derived_enum_equals"
@@ -2391,7 +2391,8 @@ bool RefactoringActionConvertToSwitchStmt::performChange() {
     bool isFunctionNameAllowed(BinaryExpr *E) {
       auto FunctionBody = dyn_cast<DotSyntaxCallExpr>(E->getFn())->getFn();
       auto FunctionDeclaration = dyn_cast<DeclRefExpr>(FunctionBody)->getDecl();
-      auto FunctionName = dyn_cast<FuncDecl>(FunctionDeclaration)->getName().str();
+      const auto FunctionName = dyn_cast<FuncDecl>(FunctionDeclaration)
+          ->getBaseIdentifier().str();
       return FunctionName == "~="
       || FunctionName == "=="
       || FunctionName == "__derived_enum_equals"
diff --git a/lib/IDE/SyntaxModel.cpp b/lib/IDE/SyntaxModel.cpp
@@ -1047,7 +1047,7 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
       // as members of the enum case decl. Walk them manually here so that they
       // end up as child nodes of enum case.
       for (auto *EnumElemD : EnumCaseD->getElements()) {
-        if (EnumElemD->getName().empty())
+        if (EnumElemD->getBaseIdentifier().empty())
           continue;
         SyntaxStructureNode SN;
         setDecl(SN, EnumElemD);
@@ -1060,7 +1060,8 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
           SN.NameRange = charSourceRangeFromSourceRange(SM, NameRange);
         } else {
           SN.NameRange = CharSourceRange(EnumElemD->getNameLoc(),
-                                         EnumElemD->getName().getLength());
+                                         EnumElemD->getBaseIdentifier()
+                                           .getLength());
         }
 
         if (auto *E = EnumElemD->getRawValueUnchecked()) {
diff --git a/lib/IRGen/GenEnum.cpp b/lib/IRGen/GenEnum.cpp
@@ -6917,7 +6917,7 @@ const TypeInfo *TypeConverter::convertEnumType(TypeBase *key, CanType type,
       auto bitPattern = strategy->getBitPatternForNoPayloadElement(elt.decl);
       assert(bitPattern.size() == fixedTI->getFixedSize().getValueInBits());
       LLVM_DEBUG(llvm::dbgs() << "  no-payload case "
-                              << elt.decl->getName().str()
+                              << elt.decl->getBaseIdentifier().str()
                               << ":\t";
             displayBitMask(bitPattern));
 
diff --git a/lib/IRGen/IRGenDebugInfo.cpp b/lib/IRGen/IRGenDebugInfo.cpp
@@ -489,7 +489,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
       }
 
     if (FD.hasName())
-      return FD.getName().str();
+      return FD.getBaseIdentifier().str();
 
     return StringRef();
   }
@@ -947,8 +947,8 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
                                   Alignment(1), true, false);
       }
       unsigned Offset = 0;
-      auto MTy = createMemberType(ElemDbgTy, ElemDecl->getName().str(), Offset,
-                                  Scope, File, Flags);
+      auto MTy = createMemberType(ElemDbgTy, ElemDecl->getBaseIdentifier().str(),
+                                  Offset, Scope, File, Flags);
       Elements.push_back(MTy);
     }
     return DBuilder.getOrCreateArray(Elements);
diff --git a/lib/Index/IndexSymbol.cpp b/lib/Index/IndexSymbol.cpp
@@ -75,7 +75,7 @@ static bool isUnitTest(const ValueDecl *D) {
     return false;
 
   // 6. ...and starts with "test".
-  if (FD->getName().str().startswith("test"))
+  if (FD->getBaseIdentifier().str().startswith("test"))
     return true;
 
   return false;
diff --git a/lib/PrintAsObjC/DeclAndTypePrinter.cpp b/lib/PrintAsObjC/DeclAndTypePrinter.cpp
@@ -395,7 +395,7 @@ class DeclAndTypePrinter::Implementation
       // name.
       os << "  ";
       if (printSwiftEnumElemNameInObjC(Elt, os)) {
-        os << " SWIFT_COMPILE_NAME(\"" << Elt->getName() << "\")";
+        os << " SWIFT_COMPILE_NAME(\"" << Elt->getBaseIdentifier() << "\")";
       }
 
       // Print the raw values, even the ones that we synthesize.
diff --git a/lib/PrintAsObjC/ModuleContentsWriter.cpp b/lib/PrintAsObjC/ModuleContentsWriter.cpp
@@ -443,7 +443,7 @@ class ModuleWriter {
       bool hasDomainCase = std::any_of(ED->getAllElements().begin(),
                                        ED->getAllElements().end(),
                                        [](const EnumElementDecl *elem) {
-        return elem->getName().str() == "Domain";
+        return elem->getBaseIdentifier().str() == "Domain";
       });
       if (!hasDomainCase) {
         os << "static NSString * _Nonnull const " << getNameForObjC(ED)
diff --git a/lib/SILGen/SILGenBuiltin.cpp b/lib/SILGen/SILGenBuiltin.cpp
@@ -1154,7 +1154,7 @@ static ManagedValue emitBuiltinApplyDerivative(
   auto builtinDecl = cast<FuncDecl>(cast<DeclRefExpr>(
       cast<DotSyntaxBaseIgnoredExpr>(callExpr->getDirectCallee())->getRHS())
           ->getDecl());
-  auto builtinName = builtinDecl->getName().str();
+  const auto builtinName = builtinDecl->getBaseIdentifier().str();
   AutoDiffDerivativeFunctionKind kind;
   unsigned arity;
   bool throws;
@@ -1172,7 +1172,7 @@ static ManagedValue emitBuiltinApplyTranspose(
   auto builtinDecl = cast<FuncDecl>(cast<DeclRefExpr>(
       cast<DotSyntaxBaseIgnoredExpr>(callExpr->getDirectCallee())->getRHS())
           ->getDecl());
-  auto builtinName = builtinDecl->getName().str();
+  const auto builtinName = builtinDecl->getBaseIdentifier().str();
   unsigned arity;
   bool throws;
   auto successfullyParsed = autodiff::getBuiltinApplyTransposeConfig(
diff --git a/lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp b/lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp
@@ -1203,11 +1203,12 @@ void LifetimeChecker::handleInOutUse(const DIMemoryUse &Use) {
     } else if (FD && FD->isOperator()) {
       diagnose(Module, Use.Inst->getLoc(),
                diag::mutating_method_called_on_immutable_value,
-               FD->getName(), /*operator*/ 1, StringRef(PropertyName));
+               FD->getBaseIdentifier(), /*operator*/ 1,
+               StringRef(PropertyName));
     } else if (FD && isSelfParameter) {
       diagnose(Module, Use.Inst->getLoc(),
                diag::mutating_method_called_on_immutable_value,
-               FD->getName(), /*method*/ 0, StringRef(PropertyName));
+               FD->getBaseIdentifier(), /*method*/ 0, StringRef(PropertyName));
     } else if (isAssignment) {
       diagnose(Module, Use.Inst->getLoc(),
                diag::assignment_to_immutable_value, StringRef(PropertyName));
@@ -1590,7 +1591,7 @@ bool LifetimeChecker::diagnoseMethodCall(const DIMemoryUse &Use,
     if (auto accessor = dyn_cast<AccessorDecl>(Method))
       Name = accessor->getStorage()->getBaseName();
     else
-      Name = Method->getName();
+      Name = Method->getBaseIdentifier();
 
     // If this is a use of self before super.init was called, emit a diagnostic
     // about *that* instead of about individual properties not being
diff --git a/lib/SILOptimizer/Mandatory/YieldOnceCheck.cpp b/lib/SILOptimizer/Mandatory/YieldOnceCheck.cpp
@@ -465,7 +465,7 @@ class YieldOnceCheck : public SILFunctionTransform {
           diagnose(astCtx, enumCaseLoc, diag::case_doesnt_yield, OptionSome);
         } else {
           diagnose(astCtx, enumCaseLoc, diag::named_case_doesnt_yield,
-                   enumElemDecl.get()->getName());
+                   enumElemDecl.get()->getBaseIdentifier());
         }
         return;
       }
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -7056,7 +7056,7 @@ Expr *ExprRewriter::convertLiteralInPlace(Expr *literal,
 static bool isValidDynamicCallableMethod(FuncDecl *method,
                                          AnyFunctionType *methodType) {
   auto &ctx = method->getASTContext();
-  if (method->getName() != ctx.Id_dynamicallyCall)
+  if (method->getBaseIdentifier() != ctx.Id_dynamicallyCall)
     return false;
   if (methodType->getParams().size() != 1)
     return false;
diff --git a/lib/Sema/CSDiagnostics.cpp b/lib/Sema/CSDiagnostics.cpp
@@ -4819,7 +4819,7 @@ bool ExtraneousReturnFailure::diagnoseAsError() {
     // because certain decls will have empty name (like setters).
     if (FD->getBodyResultTypeLoc().getLoc().isInvalid() &&
         FD->getParameters()->getStartLoc().isValid() &&
-        !FD->getName().empty()) {
+        !FD->getBaseIdentifier().empty()) {
       auto fixItLoc = Lexer::getLocForEndOfToken(
           getASTContext().SourceMgr, FD->getParameters()->getEndLoc());
       emitDiagnostic(anchor->getLoc(), diag::add_return_type_note)
@@ -5725,7 +5725,7 @@ bool ExtraneousCallFailure::diagnoseAsError() {
       if (auto *enumCase = dyn_cast<EnumElementDecl>(decl)) {
         auto diagnostic = emitDiagnostic(
             anchor->getLoc(), diag::unexpected_arguments_in_enum_case,
-            enumCase->getName());
+            enumCase->getBaseIdentifier());
         removeParensFixIt(diagnostic);
         return true;
       }
diff --git a/lib/Sema/DerivedConformanceCodable.cpp b/lib/Sema/DerivedConformanceCodable.cpp
@@ -154,10 +154,10 @@ static bool validateCodingKeysEnum(DerivedConformance &derived,
 
   bool propertiesAreValid = true;
   for (auto elt : codingKeysDecl->getAllElements()) {
-    auto it = properties.find(elt->getName());
+    auto it = properties.find(elt->getBaseIdentifier());
     if (it == properties.end()) {
       elt->diagnose(diag::codable_extraneous_codingkey_case_here,
-                    elt->getName());
+                    elt->getBaseIdentifier());
       // TODO: Investigate typo-correction here; perhaps the case name was
       //       misspelled and we can provide a fix-it.
       propertiesAreValid = false;
@@ -493,7 +493,8 @@ static std::tuple<VarDecl *, Type, bool>
 lookupVarDeclForCodingKeysCase(DeclContext *conformanceDC,
                                EnumElementDecl *elt,
                                NominalTypeDecl *targetDecl) {
-  for (auto decl : targetDecl->lookupDirect(DeclName(elt->getName()))) {
+  for (auto decl : targetDecl->lookupDirect(
+                                   DeclName(elt->getBaseIdentifier()))) {
     if (auto *vd = dyn_cast<VarDecl>(decl)) {
       // If we found a property with an attached wrapper, retrieve the
       // backing property.
diff --git a/lib/Sema/DerivedConformanceEquatableHashable.cpp b/lib/Sema/DerivedConformanceEquatableHashable.cpp
@@ -785,8 +785,8 @@ deriveBodyHashable_enum_hasAssociatedValues_hashInto(
                                                        payloadVars);
     auto pat = new (C) EnumElementPattern(TypeLoc::withoutLoc(enumType),
                                           SourceLoc(), DeclNameLoc(),
-                                          DeclNameRef(elt->getName()), elt,
-                                          payloadPattern);
+                                          DeclNameRef(elt->getBaseIdentifier()),
+                                          elt, payloadPattern);
     pat->setImplicit();
 
     auto labelItem = CaseLabelItem(pat);
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -161,7 +161,7 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
       // An indirect case should have a payload.
       if (!caseDecl->hasAssociatedValues())
         diagnose(attr->getLocation(), diag::indirect_case_without_payload,
-                 caseDecl->getName());
+                 caseDecl->getBaseIdentifier());
       // If the enum is already indirect, its cases don't need to be.
       else if (caseDecl->getParentEnum()->getAttrs()
                  .hasAttribute<IndirectAttr>())
@@ -1562,9 +1562,9 @@ void AttributeChecker::checkOperatorAttribute(DeclAttribute *attr) {
   }
 
   // Reject attempts to define builtin operators.
-  if (isBuiltinOperator(FD->getName().str(), attr)) {
+  if (isBuiltinOperator(FD->getBaseIdentifier().str(), attr)) {
     diagnose(D->getStartLoc(), diag::redefining_builtin_operator,
-             attr->getAttrName(), FD->getName().str());
+             attr->getAttrName(), FD->getBaseIdentifier().str());
     attr->setInvalid();
     return;
   }
diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
diff --git a/lib/Sema/TypeCheckSwitchStmt.cpp b/lib/Sema/TypeCheckSwitchStmt.cpp

Original file line number	Diff line number	Diff line change
`@@ -2613,7 +2613,7 @@ class PrintExpr : public ExprVisitor<PrintExpr> {`
`2613`	`2613`	`}`
`2614`	`2614`	`void visitEnumIsCaseExpr(EnumIsCaseExpr *E) {`
`2615`	`2615`	`printCommon(E, "enum_is_case_expr") << ' ' <<`
`2616`		`- E->getEnumElement()->getName() << "\n";`
	`2616`	`+ E->getEnumElement()->getBaseIdentifier() << "\n";`
`2617`	`2617`	`printRec(E->getSubExpr());`
`2618`	`2618`	`PrintWithColorRAII(OS, ParenthesisColor) << ')';`
`2619`	`2619`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6833,7 +6833,7 @@ AbstractFunctionDecl::getObjCSelector(DeclName preferredName,`
`6833`	`6833`	`return destructor->getObjCSelector();`
`6834`	`6834`	`} else if (auto func = dyn_cast<FuncDecl>(this)) {`
`6835`	`6835`	`// Otherwise cast this to be able to access getName()`
`6836`		`- baseNameStr = func->getName().str();`
	`6836`	`+ baseNameStr = func->getBaseIdentifier().str();`
`6837`	`6837`	`} else if (isa<ConstructorDecl>(this)) {`
`6838`	`6838`	`baseNameStr = "init";`
`6839`	`6839`	`} else {`
`@@ -7341,7 +7341,8 @@ SelfAccessKind FuncDecl::getSelfAccessKind() const {`
`7341`	`7341`	`}`
`7342`	`7342`
`7343`	`7343`	`bool FuncDecl::isCallAsFunctionMethod() const {`
`7344`		`- return getName() == getASTContext().Id_callAsFunction && isInstanceMember();`
	`7344`	`+ return getBaseIdentifier() == getASTContext().Id_callAsFunction &&`
	`7345`	`+ isInstanceMember();`
`7345`	`7346`	`}`
`7346`	`7347`
`7347`	`7348`	`ConstructorDecl::ConstructorDecl(DeclName Name, SourceLoc ConstructorLoc,`
`@@ -7838,7 +7839,7 @@ PrecedenceGroupDecl *InfixOperatorDecl::getPrecedenceGroup() const {`
`7838`	`7839`	`}`
`7839`	`7840`
`7840`	`7841`	`bool FuncDecl::isDeferBody() const {`
`7841`		`- return getName() == getASTContext().getIdentifier("$defer");`
	`7842`	`+ return getBaseIdentifier() == getASTContext().getIdentifier("$defer");`
`7842`	`7843`	`}`
`7843`	`7844`
`7844`	`7845`	`bool FuncDecl::isPotentialIBActionTarget() const {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ printSwiftEnumElemNameInObjC(const EnumElementDecl *EL, llvm::raw_ostream &OS,`
`90`	`90`	`}`
`91`	`91`	`OS << getNameForObjC(EL->getDeclContext()->getSelfEnumDecl());`
`92`	`92`	`if (PreferredName.empty())`
`93`		`- ElemName = EL->getName().str();`
	`93`	`+ ElemName = EL->getBaseIdentifier().str();`
`94`	`94`	`else`
`95`	`95`	`ElemName = PreferredName.str();`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ ProvidesEmitter::emitTopLevelNames() const {`
`254`	`254`	`for (const Decl *D : SF->getTopLevelDecls())`
`255`	`255`	`emitTopLevelDecl(D, cpd);`
`256`	`256`	`for (auto *operatorFunction : cpd.memberOperatorDecls)`
`257`		`- out << "- \"" << escape(operatorFunction->getName()) << "\"\n";`
	`257`	`+ out << "- \"" << escape(operatorFunction->getBaseIdentifier()) << "\"\n";`
`258`	`258`	`return cpd;`
`259`	`259`	`}`
`260`	`260`