Merge pull request #3977 from adrian-prantl/release

Fix compile error in non-asserts builds

Author: adrian-prantl

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

@@ -1218,9 +1218,7 @@ CompilerType TypeSystemSwift::GetInstanceType(CompilerType compiler_type) {
   return {};
 }
 
-#ifndef NDEBUG
 TypeSystemSwiftTypeRef::TypeSystemSwiftTypeRef() {}
-#endif
 
 TypeSystemSwiftTypeRef::~TypeSystemSwiftTypeRef() {}
 
@@ -1238,7 +1236,8 @@ TypeSystemSwiftTypeRef::TypeSystemSwiftTypeRef(Module &module) {
 
 TypeSystemSwiftTypeRefForExpressions::TypeSystemSwiftTypeRefForExpressions(
     lldb::LanguageType language, Target &target, Module &module)
-    : m_target_wp(target.shared_from_this()) {
+  : TypeSystemSwiftTypeRef(module),
+    m_target_wp(target.shared_from_this()) {
   m_description = "TypeSystemSwiftTypeRefForExpressions(PerModuleFallback)";
   LLDB_LOGF(GetLog(LLDBLog::Types),
             "%s::TypeSystemSwiftTypeRefForExpressions()",
@@ -1253,7 +1252,7 @@ TypeSystemSwiftTypeRefForExpressions::TypeSystemSwiftTypeRefForExpressions(
 
 TypeSystemSwiftTypeRefForExpressions::TypeSystemSwiftTypeRefForExpressions(
     lldb::LanguageType language, Target &target, const char *extra_options)
-    : m_target_wp(target.shared_from_this()) {
+  : m_target_wp(target.shared_from_this()) {
   m_description = "TypeSystemSwiftTypeRefForExpressions";
   LLDB_LOGF(GetLog(LLDBLog::Types),
             "%s::TypeSystemSwiftTypeRefForExpressions()",

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

@@ -51,10 +51,12 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
   static bool classof(const TypeSystem *ts) { return ts->isA(&ID); }
   /// \}
 
-#ifndef NDEBUG
+#ifdef NDEBUG
+protected:
+#endif
   /// Provided only for unit tests.
   TypeSystemSwiftTypeRef();
-#endif
+public:  
   ~TypeSystemSwiftTypeRef();
   TypeSystemSwiftTypeRef(Module &module);
   /// Get the corresponding SwiftASTContext, and create one if necessary.