Merge commit '83a58692d65a' from swift/release/5.3 into swift/master

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

Author: adrian-prantl

lldb/include/lldb/Symbol/SwiftASTContext.h

@@ -1137,9 +1137,11 @@ bool SwiftASTManipulator::AddExternalVariables(
           variable.m_type.GetTypeSystem());
 
       CompilerType referent_type;
-
       if (swift_ast_ctx)
-        referent_type = swift_ast_ctx->GetReferentType(variable.m_type);
+        referent_type =
+            swift_ast_ctx->GetReferentType(variable.m_type.GetOpaqueQualType());
+      if (!referent_type)
+        continue;
 
       // One tricky bit here is that this var may be an argument to the function
       // whose context we are

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

@@ -531,7 +531,7 @@ AddRequiredAliases(Block *block, lldb::StackFrameSP &stack_frame_sp,
   // extend the referent:
   imported_self_type =
       llvm::cast<TypeSystemSwift>(imported_self_type.GetTypeSystem())
-          ->GetReferentType(imported_self_type);
+          ->GetReferentType(imported_self_type.GetOpaqueQualType());
 
   // If we are extending a generic class it's going to be a metatype,
   // and we have to grab the instance type:
@@ -553,7 +553,6 @@ AddRequiredAliases(Block *block, lldb::StackFrameSP &stack_frame_sp,
   if (swift::WeakStorageType *weak_storage_type =
           GetSwiftType(imported_self_type)->getAs<swift::WeakStorageType>()) {
     swift::Type referent_type = weak_storage_type->getReferentType();
-
     swift::BoundGenericEnumType *optional_type =
         referent_type->getAs<swift::BoundGenericEnumType>();
 

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

@@ -780,8 +780,8 @@ SwiftLanguage::GetHardcodedSynthetics() {
                 TypeSystemSwift *swift_ast_ctx =
                     llvm::dyn_cast_or_null<TypeSystemSwift>(
                         type.GetTypeSystem());
-                if (swift_ast_ctx &&
-                    swift_ast_ctx->IsImportedType(type, nullptr))
+                if (swift_ast_ctx && swift_ast_ctx->IsImportedType(
+                                         type.GetOpaqueQualType(), nullptr))
                   is_imported = true;
               }
 

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

@@ -39,7 +39,8 @@ static clang::EnumDecl *GetAsEnumDecl(CompilerType swift_type) {
     return nullptr;
 
   CompilerType clang_type;
-  if (!swift_ast_ctx->IsImportedType(swift_type, &clang_type))
+  if (!swift_ast_ctx->IsImportedType(swift_type.GetOpaqueQualType(),
+                                     &clang_type))
     return nullptr;
 
   if (!clang_type.IsValid())