Merge pull request llvm#5967 from adrian-prantl/cherry-pick-20221013

adrian-prantl · web-flow · commit d0824514e2f5 · 2023-01-11T09:01:29.000-08:00
Add a missing nullptr check.
diff --git a/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp b/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
@@ -1484,8 +1484,10 @@ void *TypeSystemSwiftTypeRef::ReconstructType(opaque_compiler_type_t type) {
 }
 
 CompilerType TypeSystemSwiftTypeRef::ReconstructType(CompilerType type) {
-  return {GetSwiftASTContext()->weak_from_this(),
-          ReconstructType(type.GetOpaqueQualType())};
+  if (auto *swift_ast_context = GetSwiftASTContext())
+    return {swift_ast_context->weak_from_this(),
+            ReconstructType(type.GetOpaqueQualType())};
+  return {};
 }
 
 CompilerType TypeSystemSwiftTypeRef::GetTypeFromMangledTypename(

Original file line number	Diff line number	Diff line change
`@@ -1484,8 +1484,10 @@ void *TypeSystemSwiftTypeRef::ReconstructType(opaque_compiler_type_t type) {`
`1484`	`1484`	`}`
`1485`	`1485`
`1486`	`1486`	`CompilerType TypeSystemSwiftTypeRef::ReconstructType(CompilerType type) {`
`1487`		`- return {GetSwiftASTContext()->weak_from_this(),`
`1488`		`- ReconstructType(type.GetOpaqueQualType())};`
	`1487`	`+ if (auto *swift_ast_context = GetSwiftASTContext())`
	`1488`	`+ return {swift_ast_context->weak_from_this(),`
	`1489`	`+ ReconstructType(type.GetOpaqueQualType())};`
	`1490`	`+ return {};`
`1489`	`1491`	`}`
`1490`	`1492`
`1491`	`1493`	`CompilerType TypeSystemSwiftTypeRef::GetTypeFromMangledTypename(`