Skip to content

Commit 426d8c1

Browse files
committed
Fix compile error in non-asserts builds
1 parent 0a2f1ba commit 426d8c1

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,9 +1218,7 @@ CompilerType TypeSystemSwift::GetInstanceType(CompilerType compiler_type) {
12181218
return {};
12191219
}
12201220

1221-
#ifndef NDEBUG
12221221
TypeSystemSwiftTypeRef::TypeSystemSwiftTypeRef() {}
1223-
#endif
12241222

12251223
TypeSystemSwiftTypeRef::~TypeSystemSwiftTypeRef() {}
12261224

@@ -1238,7 +1236,8 @@ TypeSystemSwiftTypeRef::TypeSystemSwiftTypeRef(Module &module) {
12381236

12391237
TypeSystemSwiftTypeRefForExpressions::TypeSystemSwiftTypeRefForExpressions(
12401238
lldb::LanguageType language, Target &target, Module &module)
1241-
: m_target_wp(target.shared_from_this()) {
1239+
: TypeSystemSwiftTypeRef(module),
1240+
m_target_wp(target.shared_from_this()) {
12421241
m_description = "TypeSystemSwiftTypeRefForExpressions(PerModuleFallback)";
12431242
LLDB_LOGF(GetLog(LLDBLog::Types),
12441243
"%s::TypeSystemSwiftTypeRefForExpressions()",
@@ -1253,7 +1252,7 @@ TypeSystemSwiftTypeRefForExpressions::TypeSystemSwiftTypeRefForExpressions(
12531252

12541253
TypeSystemSwiftTypeRefForExpressions::TypeSystemSwiftTypeRefForExpressions(
12551254
lldb::LanguageType language, Target &target, const char *extra_options)
1256-
: m_target_wp(target.shared_from_this()) {
1255+
: m_target_wp(target.shared_from_this()) {
12571256
m_description = "TypeSystemSwiftTypeRefForExpressions";
12581257
LLDB_LOGF(GetLog(LLDBLog::Types),
12591258
"%s::TypeSystemSwiftTypeRefForExpressions()",

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,12 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
5151
static bool classof(const TypeSystem *ts) { return ts->isA(&ID); }
5252
/// \}
5353

54-
#ifndef NDEBUG
54+
#ifdef NDEBUG
55+
protected:
56+
#endif
5557
/// Provided only for unit tests.
5658
TypeSystemSwiftTypeRef();
57-
#endif
59+
public:
5860
~TypeSystemSwiftTypeRef();
5961
TypeSystemSwiftTypeRef(Module &module);
6062
/// Get the corresponding SwiftASTContext, and create one if necessary.

0 commit comments

Comments
 (0)