[AST] Fix comparison to of SourceRanges in container

[njames93]

clang/lib/Tooling/NodeIntrospection.cpp

47

Maybe we should assert the ranges (or locations) are valid before inserting. Will require modification to the generator script but it would make subsequent handling simpler.

[steveire]

clang/lib/Tooling/NodeIntrospection.cpp

47

I don't think I agree, but I think that's a different patch. We should fix the bug for now.

[njames93]

clang/lib/Tooling/NodeIntrospection.cpp

47

Fair enough, though this doesn't seem a great solution, Semantics of Sourcelocation comparisons for invalid source lox

clang/lib/Tooling/NodeIntrospection.cpp

std::string LocationCallFormatterCpp::format(const LocationCall &Call) {
   OS.flush();
   return Result;
 }
 
 namespace internal {
 bool RangeLessThan::operator()(
     std::pair<SourceRange, SharedLocationCall> const &LHS,
     std::pair<SourceRange, SharedLocationCall> const &RHS) const {
-  if (!LHS.first.isValid() || !RHS.first.isValid())
-    return false;
-
   if (LHS.first.getBegin() < RHS.first.getBegin())
     return true;
   else if (LHS.first.getBegin() != RHS.first.getBegin())
     return false;
 
   if (LHS.first.getEnd() < RHS.first.getEnd())
     return true;
   else if (LHS.first.getEnd() != RHS.first.getEnd())

clang/unittests/Introspection/IntrospectionTest.cpp

TEST(Introspection, SourceLocations_CallContainer) {
   auto callTypeLoc =
       llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getTypeLoc");
   slm.insert(std::make_pair(
       SourceLocation(),
       llvm::makeIntrusiveRefCnt<LocationCall>(callTypeLoc, "getSourceRange")));
   EXPECT_EQ(slm.size(), 2u);
 }
 
+TEST(Introspection, SourceLocations_CallContainer2) {
+  SourceRangeMap slm;
+  SharedLocationCall Prefix;
+  slm.insert(
+      std::make_pair(SourceRange(), llvm::makeIntrusiveRefCnt<LocationCall>(
+                                        Prefix, "getCXXOperatorNameRange")));
+  EXPECT_EQ(slm.size(), 1u);
+
+  slm.insert(std::make_pair(
+      SourceRange(),
+      llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getSourceRange")));
+  EXPECT_EQ(slm.size(), 2u);
+}
+
 TEST(Introspection, SourceLocations_CallChainFormatting) {
   SharedLocationCall Prefix;
   auto chainedCall = llvm::makeIntrusiveRefCnt<LocationCall>(
       llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getTypeLoc"),
       "getSourceRange");
   EXPECT_EQ(LocationCallFormatterCpp::format(*chainedCall),
             "getTypeLoc().getSourceRange()");
 }