commit db7b5f09002085d1dfafea6ae3ec365a342e7e45
author Stephen Kelly <steveire@gmail.com> Fri Apr 16 22:29:06 2021 +0100
committer Copybara-Service <copybara-worker@google.com> Sat Apr 17 21:20:17 2021 -0700
tree e35bd383fc84b8d351d5a98a757ebc4699022e84
parent 1f28dcdc1ea40ddba2ead18bdc1127bc5b0b46ef

[AST] Remove args from LocationCall

This class initially had args to be generic to future needs. In
particular, I thought that source location introspection should show the
getBeginLoc of CallExpr args and the getArgLoc of
TemplateSpecializationLocInfo etc.  However, that is probably best left
out of source location introspection because it involves node traversal.

If something like this is needed in the future, it can be added in the
future.

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

GitOrigin-RevId: ebc6608fb79057eaed27435d62d5dea0979bd9d3

include/clang/Tooling/NodeIntrospection.h

diff --git a/include/clang/Tooling/NodeIntrospection.h b/include/clang/Tooling/NodeIntrospection.h
index 5489a67..c8518ea 100644
--- a/include/clang/Tooling/NodeIntrospection.h
+++ b/include/clang/Tooling/NodeIntrospection.h
@@ -38,14 +38,9 @@
   LocationCall(SharedLocationCall on, std::string name,
                LocationCallFlags flags = NoFlags)
       : m_flags(flags), m_on(std::move(on)), m_name(std::move(name)) {}
-  LocationCall(SharedLocationCall on, std::string name,
-               std::vector<std::string> args, LocationCallFlags flags = NoFlags)
-      : m_flags(flags), m_on(std::move(on)), m_name(std::move(name)),
-        m_args(std::move(args)) {}
 
   LocationCall *on() const { return m_on.get(); }
   StringRef name() const { return m_name; }
-  ArrayRef<std::string> args() const { return m_args; }
   bool returnsPointer() const { return m_flags & ReturnsPointer; }
   bool isCast() const { return m_flags & IsCast; }
 
@@ -53,7 +48,6 @@
   LocationCallFlags m_flags;
   SharedLocationCall m_on;
   std::string m_name;
-  std::vector<std::string> m_args;
 };
 
 class LocationCallFormatterCpp {

lib/Tooling/NodeIntrospection.cpp

diff --git a/lib/Tooling/NodeIntrospection.cpp b/lib/Tooling/NodeIntrospection.cpp
index 0e3ef3c..6a8d726 100644
--- a/lib/Tooling/NodeIntrospection.cpp
+++ b/lib/Tooling/NodeIntrospection.cpp
@@ -29,16 +29,7 @@
       OS << '.';
   }
 
-  OS << Call.name();
-  if (Call.args().empty()) {
-    OS << "()";
-    return;
-  }
-  OS << '(' << Call.args().front();
-  for (const std::string &Arg : Call.args().drop_front()) {
-    OS << ", " << Arg;
-  }
-  OS << ')';
+  OS << Call.name() << "()";
 }
 
 std::string LocationCallFormatterCpp::format(const LocationCall &Call) {

unittests/Introspection/IntrospectionTest.cpp

diff --git a/unittests/Introspection/IntrospectionTest.cpp b/unittests/Introspection/IntrospectionTest.cpp
index ad21748..e56963a 100644
--- a/unittests/Introspection/IntrospectionTest.cpp
+++ b/unittests/Introspection/IntrospectionTest.cpp
@@ -61,16 +61,7 @@
       print(*On, OS);
       OS << '.';
     }
-    OS << Call.name();
-    if (Call.args().empty()) {
-      OS << "()";
-      return;
-    }
-    OS << '(' << Call.args().front();
-    for (const std::string &Arg : Call.args().drop_front()) {
-      OS << ", " << Arg;
-    }
-    OS << ')';
+    OS << Call.name() << "()";
   }
 
   static std::string format(const LocationCall &Call) {