Merge pull request #9978 from ahoppen/pdm-remove-implicit-conversion
Remove implicit conversion from DeclBaseName to Identifier
diff --git a/include/swift/AST/Identifier.h b/include/swift/AST/Identifier.h
index 9e85dcf..6dc05aa 100644
--- a/include/swift/AST/Identifier.h
+++ b/include/swift/AST/Identifier.h
@@ -250,11 +250,6 @@
return Ident.get() < RHS.Ident.get();
}
- // TODO: Remove once migration to DeclBaseName has been completed
- operator Identifier() {
- return getIdentifier();
- }
-
const void *getAsOpaquePointer() const { return Ident.get(); }
static DeclBaseName getFromOpaquePointer(void *P) {
diff --git a/lib/Sema/CSDiag.cpp b/lib/Sema/CSDiag.cpp
index feaffde..d28b642 100644
--- a/lib/Sema/CSDiag.cpp
+++ b/lib/Sema/CSDiag.cpp
@@ -7141,7 +7141,7 @@
switch (auto kind = component.getKind()) {
case KeyPathExpr::Component::Kind::UnresolvedProperty: {
auto componentFullName = component.getUnresolvedDeclName();
- componentName = componentFullName.getBaseName();
+ componentName = componentFullName.getBaseIdentifier();
break;
}
diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
index 865567f..c2feff7 100644
--- a/lib/Sema/TypeCheckConstraints.cpp
+++ b/lib/Sema/TypeCheckConstraints.cpp
@@ -1041,7 +1041,7 @@
if (!UDE->getName().isSimpleName())
return nullptr;
- auto Name = UDE->getName().getBaseName();
+ auto Name = UDE->getName().getBaseIdentifier();
auto NameLoc = UDE->getNameLoc().getBaseNameLoc();
// Qualified type lookup with a module base is represented as a DeclRefExpr
