Merge pull request #127 from slavapestov/small-lldb-swift-cleanup

[Swift] Use llvm casts instead of looking at {Decl,TypeBase}::getKind()

Author: slavapestov

source/Symbol/SwiftASTContext.cpp

@@ -433,7 +433,7 @@ CachedMemberInfo *SwiftASTContext::GetCachedMemberInfo(void *type) {
           }
 
           for (auto decl : nominal_decl->getMembers()) {
-            if (decl->getKind() == swift::DeclKind::Var) {
+            if (swift::isa<swift::VarDecl>(decl)) {
               swift::VarDecl *var_decl = llvm::cast<swift::VarDecl>(decl);
               if (var_decl->hasStorage() && !var_decl->isStatic()) {
                 MemberInfo member_info(MemberType::Field);
@@ -494,7 +494,7 @@ CachedMemberInfo *SwiftASTContext::GetCachedMemberInfo(void *type) {
 
           for (auto decl : t_decl->getMembers()) {
             // Find ivars that aren't properties
-            if (decl->getKind() == swift::DeclKind::Var) {
+            if (swift::isa<swift::VarDecl>(decl)) {
               swift::VarDecl *var_decl = llvm::cast<swift::VarDecl>(decl);
               if (var_decl->hasStorage() && !var_decl->isStatic()) {
                 MemberInfo member_info(MemberType::Field);
@@ -4008,13 +4008,7 @@ ConstString SwiftASTContext::GetMangledTypeName(swift::TypeBase *type_base) {
 
   swift::Type swift_type(type_base);
 
-  bool has_archetypes = false;
-
-  swift_type.visit([&has_archetypes](swift::Type part_type) -> void {
-    if (part_type->getKind() == swift::TypeKind::Archetype) {
-      has_archetypes = true;
-    }
-  });
+  bool has_archetypes = swift_type->hasArchetype();
 
   if (!has_archetypes) {
     swift::Mangle::Mangler mangler(true);