Merge pull request #7383 from adrian-prantl/refactor-remove-ast8

fix minor typos

Author: adrian-prantl

lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp

@@ -38,9 +38,6 @@
 #include <mutex>
 
 #include "swift/AST/ImportCache.h"
-#include "swift/AST/Module.h"
-#include "swift/AST/Type.h"
-#include "swift/AST/Types.h"
 #include "swift/Basic/InitializeSwiftModules.h"
 #include "swift/Demangling/ManglingMacros.h"
 #include "llvm/Support/ConvertUTF.h"

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -496,7 +496,7 @@ llvm::Optional<uint64_t> SwiftLanguageRuntimeImpl::GetMemberVariableOffset(
             "[GetMemberVariableOffset] asked to resolve offset for member %s",
             member_name.str().c_str());
 
-  // Using the module context for RemoteAST is cheaper bit only safe
+  // Using the module context for RemoteAST is cheaper but only safe
   // when there is no dynamic type resolution involved.
   // If this is already in the expression context, ask RemoteAST.
   if (instance_type.GetTypeSystem().isa_and_nonnull<SwiftASTContext>())
@@ -2361,8 +2361,8 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_ClangType(
 
 static bool IsIndirectEnumCase(ValueObject &valobj) {
   return (valobj.GetLanguageFlags() &
-          SwiftASTContext::LanguageFlags::eIsIndirectEnumCase) ==
-         SwiftASTContext::LanguageFlags::eIsIndirectEnumCase;
+          TypeSystemSwift::LanguageFlags::eIsIndirectEnumCase) ==
+         TypeSystemSwift::LanguageFlags::eIsIndirectEnumCase;
 }
 
 static bool CouldHaveDynamicValue(ValueObject &in_value) {

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserSwift.cpp

@@ -19,12 +19,6 @@
 #include "DWARFDefines.h"
 #include "SymbolFileDWARF.h"
 
-#include "swift/AST/ASTContext.h"
-#include "swift/AST/Decl.h"
-#include "swift/Demangling/Demangle.h"
-
-#include "clang/AST/DeclObjC.h"
-
 #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h"
@@ -38,6 +32,8 @@
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/Status.h"
 
+#include "clang/AST/DeclObjC.h"
+
 using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::dwarf;

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -34,9 +34,6 @@
 #include "swift/ClangImporter/ClangImporter.h"
 #include "swift/../../lib/ClangImporter/ClangAdapter.h"
 #include "swift/Frontend/Frontend.h"
-#include "swift/AST/ClangModuleLoader.h"
-#include "swift/Basic/Version.h"
-#include "swift/Strings.h"
 
 #include "clang/APINotes/APINotesManager.h"
 #include "clang/APINotes/APINotesReader.h"