diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp
index b43b318000034..9f63d200a2a64 100644
--- a/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp
@@ -709,7 +709,7 @@ bool SwiftASTManipulator::FixupResultAfterTypeChecking(Status &error) {
           "Type of %zuth return value could not be determined.", i);
       return false;
     }
-    swift::Type its_type = the_decl->getType();
+    swift::Type its_type = the_decl->getTypeInContext();
     if (result_type.isNull()) {
       result_type = its_type;
     } else if (!its_type.getPointer()->isEqual(result_type)) {
diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
index 29a33df525d79..65c72d89e02ab 100644
--- a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
+++ b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
@@ -6933,7 +6933,7 @@ CompilerType SwiftASTContext::GetChildCompilerTypeAtIndex(
               continue;
 
             CompilerType child_type =
-                ToCompilerType(VD->getType().getPointer());
+                ToCompilerType(VD->getTypeInContext().getPointer());
             child_name = VD->getNameStr().str();
             if (!get_type_size(child_byte_size, child_type))
               return {};