Do not include SB headers in Plugins/

Author: adrian-prantl

lldb/source/Core/ValueObjectDynamicValue.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Core/ValueObjectDynamicValue.h"
-#include "lldb/API/SBLanguages.h"
 #include "lldb/Core/Value.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/Symbol/CompilerType.h"
@@ -22,6 +21,7 @@
 #include "lldb/Utility/Scalar.h"
 #include "lldb/Utility/Status.h"
 #include "lldb/lldb-types.h"
+#include "llvm/BinaryFormat/Dwarf.h"
 
 #include <cstring>
 #include <optional>
@@ -168,8 +168,8 @@ bool ValueObjectDynamicValue::UpdateValue() {
 #ifdef LLDB_ENABLE_SWIFT
   // An Objective-C object inside a Swift frame.
   if (known_type == eLanguageTypeObjC)
-    if ((exe_ctx.GetFramePtr() &&
-         exe_ctx.GetFramePtr()->GetLanguage().name == eLanguageNameSwift) ||
+    if ((exe_ctx.GetFramePtr() && exe_ctx.GetFramePtr()->GetLanguage().name ==
+                                      llvm::dwarf::DW_LNAME_Swift) ||
         (exe_ctx.GetTargetPtr() && exe_ctx.GetTargetPtr()->IsSwiftREPL())) {
       runtime = process->GetLanguageRuntime(lldb::eLanguageTypeSwift);
       if (runtime)

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -22,7 +22,6 @@
 #include "SwiftUserExpression.h"
 
 #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
-#include "lldb/API/SBLanguages.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/ModuleSpec.h"
@@ -47,6 +46,7 @@
 #include "llvm-c/Analysis.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
@@ -101,7 +101,7 @@ SwiftExpressionParser::SwiftExpressionParser(
       m_expr(expr), m_swift_ast_ctx(swift_ast_ctx), m_exe_scope(exe_scope),
       m_local_variables(std::move(local_variables)),
       m_options(options) {
-  assert(expr.Language().name == eLanguageNameSwift);
+  assert(expr.Language().name == llvm::dwarf::DW_LNAME_Swift);
 
   // TODO: This code is copied from ClangExpressionParser.cpp.
   // Factor this out into common code.

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionSourceCode.cpp

@@ -11,17 +11,18 @@
 
 #include "Plugins/ExpressionParser/Swift/SwiftASTManipulator.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
-#include "lldb/API/SBLanguages.h"
 #include "lldb/Target/Language.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Utility/StreamString.h"
 
-#include "llvm/ADT/StringRef.h"
 #include "swift/Basic/LangOptions.h"
 #include "swift/Demangling/Demangle.h"
 #include "swift/Demangling/Demangler.h"
 
+#include "llvm/ADT/StringRef.h"
+#include "llvm/BinaryFormat/Dwarf.h"
+
 using namespace lldb;
 using namespace lldb_private;
 
@@ -571,7 +572,7 @@ Status SwiftExpressionSourceCode::GetText(
     const uint32_t pound_line = options.GetPoundLineLine();
     StreamString pound_body;
     if (pound_file && pound_line) {
-      if (wrapping_language.name == eLanguageNameSwift) {
+      if (wrapping_language.name == llvm::dwarf::DW_LNAME_Swift) {
         pound_body.Printf("#sourceLocation(file: \"%s\", line: %u)\n%s",
                           pound_file, pound_line, body);
       } else {
@@ -580,7 +581,7 @@ Status SwiftExpressionSourceCode::GetText(
       body = pound_body.GetString().data();
     }
 
-    if (wrapping_language.name != eLanguageNameSwift) {
+    if (wrapping_language.name != llvm::dwarf::DW_LNAME_Swift) {
       status.SetErrorString("language is not Swift");
       return status;
     }

lldb/source/Plugins/ExpressionParser/Swift/SwiftUserExpression.cpp

@@ -24,7 +24,6 @@
 #endif
 
 #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
-#include "lldb/API/SBLanguages.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Expression/DiagnosticManager.h"
 #include "lldb/Expression/ExpressionParser.h"
@@ -45,6 +44,7 @@
 #include "swift/AST/ASTContext.h"
 #include "swift/Demangling/Demangler.h"
 #include "swift/AST/GenericEnvironment.h"
+#include "llvm/BinaryFormat/Dwarf.h"
 
 #include <map>
 #include <string>
@@ -98,7 +98,8 @@ void SwiftUserExpression::DidFinishExecuting() {
 static bool isSwiftLanguageSymbolContext(const SwiftUserExpression &expr,
                                          const SymbolContext &sym_ctx) {
   if (sym_ctx.comp_unit &&
-      (!expr.Language() || expr.Language().name == eLanguageNameSwift)) {
+      (!expr.Language() ||
+       expr.Language().name == llvm::dwarf::DW_LNAME_Swift)) {
     if (sym_ctx.comp_unit->GetLanguage() == lldb::eLanguageTypeSwift)
       return true;
   } else if (sym_ctx.symbol && !expr.Language()) {

lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.cpp

@@ -9,7 +9,6 @@
 #include "InstrumentationRuntimeMainThreadChecker.h"
 
 #include "Plugins/Process/Utility/HistoryThread.h"
-#include "lldb/API/SBLanguages.h"
 #include "lldb/Breakpoint/StoppointCallbackContext.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/PluginManager.h"
@@ -30,6 +29,7 @@
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/NameLookup.h"
 #include "swift/ClangImporter/ClangImporter.h"
+#include "llvm/BinaryFormat/Dwarf.h"
 #endif // LLDB_ENABLE_SWIFT
 
 #include <memory>
@@ -227,7 +227,7 @@ InstrumentationRuntimeMainThreadChecker::RetrieveReportData(
 
 #ifdef LLDB_ENABLE_SWIFT
   if (responsible_frame) {
-    if (responsible_frame->GetLanguage().name == eLanguageNameSwift) {
+    if (responsible_frame->GetLanguage().name == llvm::dwarf::DW_LNAME_Swift) {
       std::string swiftApiName =
           TranslateObjCNameToSwiftName(className, selector, responsible_frame);
       if (swiftApiName != "")

lldb/source/Target/ThreadPlanCallFunction.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Target/ThreadPlanCallFunction.h"
-#include "lldb/API/SBLanguages.h"
 #include "lldb/Breakpoint/Breakpoint.h"
 #include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Core/Address.h"
@@ -31,7 +30,8 @@
 #ifdef LLDB_ENABLE_SWIFT
 #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/ExpressionParser/Swift/SwiftPersistentExpressionState.h"
-#endif //LLDB_ENABLE_SWIFT
+#include "llvm/BinaryFormat/Dwarf.h"
+#endif // LLDB_ENABLE_SWIFT
 
 using namespace lldb;
 using namespace lldb_private;
@@ -428,7 +428,7 @@ void ThreadPlanCallFunction::SetBreakpoints() {
     }
   }
 #ifdef LLDB_ENABLE_SWIFT
-  if (GetExpressionLanguage().name == eLanguageNameSwift) {
+  if (GetExpressionLanguage().name == llvm::dwarf::DW_LNAME_Swift) {
     auto *swift_runtime 
         = SwiftLanguageRuntime::Get(m_process.shared_from_this());
     if (swift_runtime) {

lldb/source/Target/ThreadPlanStepOut.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Target/ThreadPlanStepOut.h"
-#include "lldb/API/SBLanguages.h"
 #include "lldb/Breakpoint/Breakpoint.h"
 #include "lldb/Core/Value.h"
 #include "lldb/Core/ValueObjectConstResult.h"
@@ -31,6 +30,7 @@
 
 #ifdef LLDB_ENABLE_SWIFT
 #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
+#include "llvm/BinaryFormat/Dwarf.h"
 #endif // LLDB_ENABLE_SWIFT
 
 using namespace lldb;
@@ -180,7 +180,7 @@ ThreadPlanStepOut::ThreadPlanStepOut(
   if (frame_idx == 0) {
     StackFrameSP frame_sp = GetThread().GetStackFrameAtIndex(0);
 #ifdef LLDB_ENABLE_SWIFT
-    if (frame_sp->GuessLanguage().name == eLanguageNameSwift) {
+    if (frame_sp->GuessLanguage().name == llvm::dwarf::DW_LNAME_Swift) {
       auto *swift_runtime 
           = SwiftLanguageRuntime::Get(m_process.shared_from_this());
       if (swift_runtime) {