commit fd569a11b585d13cdceac2d890c2beda0fa5f0eb
author Simon Tatham <simon.tatham@arm.com> Fri Jun 18 13:43:13 2021 +0100
committer Simon Tatham <simon.tatham@arm.com> Fri Jun 18 13:43:14 2021 +0100
tree 7059f5390230960f001776182c8f75d7688d1d78
parent 8962c68ad007a525f9daa987c99eda57e0d0069a

[libclang] Fix error handler in translateSourceLocation.

Given an invalid SourceLocation, translateSourceLocation will call
clang_getNullLocation, and then do nothing with the result. But
clang_getNullLocation has no side effects: it just constructs and
returns a null CXSourceLocation value.

Surely the intention was to //return// that null CXSourceLocation to
the caller, instead of throwing it away and pressing on anyway.

Reviewed By: miyuki

Differential Revision: https://reviews.llvm.org/D104442

clang/tools/libclang/CXSourceLocation.h

diff --git a/clang/tools/libclang/CXSourceLocation.h b/clang/tools/libclang/CXSourceLocation.h
index ce3d09e..c86f685 100644
--- a/clang/tools/libclang/CXSourceLocation.h
+++ b/clang/tools/libclang/CXSourceLocation.h
@@ -29,7 +29,7 @@
 translateSourceLocation(const SourceManager &SM, const LangOptions &LangOpts,
                         SourceLocation Loc) {
   if (Loc.isInvalid())
-    clang_getNullLocation();
+    return clang_getNullLocation();
 
   CXSourceLocation Result = { { &SM, &LangOpts, },
                               Loc.getRawEncoding() };