Merge pull request #73499 from augusto2112/nullptr-source-lock

Add nullptr check in maybeExtractNearestSourceLoc
apple · May 10, 2024 · db1c721 · db1c721
2 parents 2f361ae + b7bc872
commit db1c721
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/include/swift/AST/SimpleRequest.h b/include/swift/AST/SimpleRequest.h
@@ -100,6 +100,11 @@ template<typename T,
          typename = typename std::enable_if<
              canExtractNearestSourceLoc<T>()>::type>
 SourceLoc maybeExtractNearestSourceLoc(const T& value) {
+  if constexpr (std::is_pointer_v<T>) {
+    if (value == nullptr) {
+      return SourceLoc();
+    }
+  }
   return extractNearestSourceLoc(value);
 }
 

diff --git a/lib/AST/DeclContext.cpp b/lib/AST/DeclContext.cpp
@@ -1418,6 +1418,8 @@ bool DeclContext::isAsyncContext() const {
 }
 
 SourceLoc swift::extractNearestSourceLoc(const DeclContext *dc) {
+  assert(dc && "Expected non-null DeclContext!");
+
   switch (dc->getContextKind()) {
   case DeclContextKind::Package:
   case DeclContextKind::Module: