Merge commit '676a5be9b532' from apple/stable/20200108 into swift/release/5.3

git apple-llvm automerger · git apple-llvm automerger · commit 6811d14c28d2 · 2020-09-25T16:14:20.000-07:00
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
@@ -155,6 +155,9 @@ CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo(
         member__f_ = sub_member__f_;
   }
 
+  if (!member__f_)
+    return optional_info;
+
   lldb::addr_t member__f_pointer_value = member__f_->GetValueAsUnsigned(0);
 
   optional_info.member__f_pointer_value = member__f_pointer_value;

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,9 @@ CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo(`
`155`	`155`	`member__f_ = sub_member__f_;`
`156`	`156`	`}`
`157`	`157`
	`158`	`+ if (!member__f_)`
	`159`	`+ return optional_info;`
	`160`	`+`
`158`	`161`	`lldb::addr_t member__f_pointer_value = member__f_->GetValueAsUnsigned(0);`
`159`	`162`
`160`	`163`	`optional_info.member__f_pointer_value = member__f_pointer_value;`