teemperor created this revision.
teemperor added reviewers: davide, shafik.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
We assume in LLDB that every type comes from an ASTContext with an associated
ClangASTContext.
However the types inside the ClangModuleDeclVendor don't have a ClangASTContext
so we end up
crashing whenever we create a CompilerType for one of these types.
Simplest way to trigger this bug is to just look up NSObject from a module:
(lldb) expr @import Foundation
(lldb) type lookup NSObject
Assertion failed: (m_type_system != nullptr), function CompilerType, file
/Users/teemperor/llvm1/llvm-project/lldb/source/Symbol/CompilerType.cpp, line
39.
This patch just creates a ClangASTContext for the ASTContext used by
ClangModuleDeclVendor.
Repository:
rLLDB LLDB
https://reviews.llvm.org/D64989
Files:
lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
Index: lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
===================================================================
--- lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
+++ lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
@@ -27,6 +27,7 @@
#include "lldb/Core/ModuleList.h"
#include "lldb/Host/Host.h"
#include "lldb/Host/HostInfo.h"
+#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/CompileUnit.h"
#include "lldb/Symbol/SourceModule.h"
#include "lldb/Target/Target.h"
@@ -110,6 +111,9 @@
ImportedModuleMap m_imported_modules;
ImportedModuleSet m_user_imported_modules;
const clang::ExternalASTMerger::OriginMap m_origin_map;
+ // We assume that every ASTContext has an ClangASTContext, so we also store
+ // a custom ClangASTContext for our internal ASTContext.
+ std::unique_ptr<ClangASTContext> m_ast_context;
};
} // anonymous namespace
@@ -155,7 +159,13 @@
: m_diagnostics_engine(std::move(diagnostics_engine)),
m_compiler_invocation(std::move(compiler_invocation)),
m_compiler_instance(std::move(compiler_instance)),
- m_parser(std::move(parser)), m_origin_map() {}
+ m_parser(std::move(parser)), m_origin_map() {
+
+ // Initialize our ClangASTContext.
+ auto target_opts = m_compiler_invocation->getTargetOpts();
+ m_ast_context.reset(new ClangASTContext(target_opts.Triple.c_str()));
+ m_ast_context->setASTContext(&m_compiler_instance->getASTContext());
+}
void ClangModulesDeclVendorImpl::ReportModuleExportsHelper(
std::set<ClangModulesDeclVendor::ModuleID> &exports,
Index: lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
+++ lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
@@ -60,6 +60,10 @@
"int",
"4"])
+ # Type lookup should still work and print something reasonable
+ # for types from the module.
+ self.expect("type lookup NSObject", substrs=["instanceMethod"])
+
self.expect("expr string.length", VARIABLES_DISPLAYED_CORRECTLY,
substrs=["NSUInteger", "5"])
Index: lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
===================================================================
--- lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
+++ lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
@@ -27,6 +27,7 @@
#include "lldb/Core/ModuleList.h"
#include "lldb/Host/Host.h"
#include "lldb/Host/HostInfo.h"
+#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/CompileUnit.h"
#include "lldb/Symbol/SourceModule.h"
#include "lldb/Target/Target.h"
@@ -110,6 +111,9 @@
ImportedModuleMap m_imported_modules;
ImportedModuleSet m_user_imported_modules;
const clang::ExternalASTMerger::OriginMap m_origin_map;
+ // We assume that every ASTContext has an ClangASTContext, so we also store
+ // a custom ClangASTContext for our internal ASTContext.
+ std::unique_ptr<ClangASTContext> m_ast_context;
};
} // anonymous namespace
@@ -155,7 +159,13 @@
: m_diagnostics_engine(std::move(diagnostics_engine)),
m_compiler_invocation(std::move(compiler_invocation)),
m_compiler_instance(std::move(compiler_instance)),
- m_parser(std::move(parser)), m_origin_map() {}
+ m_parser(std::move(parser)), m_origin_map() {
+
+ // Initialize our ClangASTContext.
+ auto target_opts = m_compiler_invocation->getTargetOpts();
+ m_ast_context.reset(new ClangASTContext(target_opts.Triple.c_str()));
+ m_ast_context->setASTContext(&m_compiler_instance->getASTContext());
+}
void ClangModulesDeclVendorImpl::ReportModuleExportsHelper(
std::set<ClangModulesDeclVendor::ModuleID> &exports,
Index: lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
+++ lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
@@ -60,6 +60,10 @@
"int",
"4"])
+ # Type lookup should still work and print something reasonable
+ # for types from the module.
+ self.expect("type lookup NSObject", substrs=["instanceMethod"])
+
self.expect("expr string.length", VARIABLES_DISPLAYED_CORRECTLY,
substrs=["NSUInteger", "5"])
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
