njames93 created this revision.
njames93 added a reviewer: steveire.
njames93 requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D100378
Files:
clang/include/clang/Tooling/NodeIntrospection.h
clang/lib/Tooling/DumpTool/generate_cxx_src_locs.py
clang/lib/Tooling/NodeIntrospection.cpp
Index: clang/lib/Tooling/NodeIntrospection.cpp
===================================================================
--- clang/lib/Tooling/NodeIntrospection.cpp
+++ clang/lib/Tooling/NodeIntrospection.cpp
@@ -36,8 +36,8 @@
namespace internal {
bool RangeLessThan::operator()(
- std::pair<SourceRange, std::shared_ptr<LocationCall>> const &LHS,
- std::pair<SourceRange, std::shared_ptr<LocationCall>> const &RHS) const {
+ std::pair<SourceRange, SharedLocationCall> const &LHS,
+ std::pair<SourceRange, SharedLocationCall> const &RHS) const {
if (!LHS.first.isValid() || !RHS.first.isValid())
return false;
@@ -53,6 +53,13 @@
return LHS.second->name() < RHS.second->name();
}
+bool RangeLessThan::operator()(
+ std::pair<SourceLocation, SharedLocationCall> const &LHS,
+ std::pair<SourceLocation, SharedLocationCall> const &RHS) const {
+ if (LHS.first == RHS.first)
+ return LHS.second->name() < RHS.second->name();
+ return LHS.first < RHS.first;
+}
} // namespace internal
} // namespace tooling
Index: clang/lib/Tooling/DumpTool/generate_cxx_src_locs.py
===================================================================
--- clang/lib/Tooling/DumpTool/generate_cxx_src_locs.py
+++ clang/lib/Tooling/DumpTool/generate_cxx_src_locs.py
@@ -33,7 +33,7 @@
def GenerateBaseGetLocationsDeclaration(self, CladeName):
self.implementationContent += \
"""
-void GetLocationsImpl(std::shared_ptr<LocationCall> const& Prefix,
+void GetLocationsImpl(SharedLocationCall const& Prefix,
clang::{0} const *Object, SourceLocationMap &Locs,
SourceRangeMap &Rngs);
""".format(CladeName)
@@ -42,7 +42,7 @@
self.implementationContent += \
"""
-static void GetLocations{0}(std::shared_ptr<LocationCall> const& Prefix,
+static void GetLocations{0}(SharedLocationCall const& Prefix,
clang::{0} const &Object,
SourceLocationMap &Locs, SourceRangeMap &Rngs)
{{
@@ -53,7 +53,7 @@
self.implementationContent += \
"""
Locs.insert(LocationAndString(Object.{0}(),
- std::make_shared<LocationCall>(Prefix, "{0}")));
+ llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "{0}")));
""".format(locName)
self.implementationContent += '\n'
@@ -63,7 +63,7 @@
self.implementationContent += \
"""
Rngs.insert(RangeAndString(Object.{0}(),
- std::make_shared<LocationCall>(Prefix, "{0}")));
+ llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "{0}")));
""".format(rngName)
self.implementationContent += '\n'
@@ -83,7 +83,7 @@
'GetLocations(clang::{0} const *Object)'.format(CladeName)
ImplSignature = \
"""
-GetLocationsImpl(std::shared_ptr<LocationCall> const& Prefix,
+GetLocationsImpl(SharedLocationCall const& Prefix,
clang::{0} const *Object, SourceLocationMap &Locs,
SourceRangeMap &Rngs)
""".format(CladeName)
@@ -108,7 +108,7 @@
"""
{0} NodeIntrospection::{1} {{
NodeLocationAccessors Result;
- std::shared_ptr<LocationCall> Prefix;
+ SharedLocationCall Prefix;
GetLocationsImpl(Prefix, Object, Result.LocationAccessors,
Result.RangeAccessors);
Index: clang/include/clang/Tooling/NodeIntrospection.h
===================================================================
--- clang/include/clang/Tooling/NodeIntrospection.h
+++ clang/include/clang/Tooling/NodeIntrospection.h
@@ -15,8 +15,7 @@
#include "clang/AST/ASTTypeTraits.h"
#include "clang/AST/DeclarationName.h"
-
-#include <memory>
+#include "llvm/ADT/IntrusiveRefCntPtr.h"
#include <set>
namespace clang {
@@ -26,16 +25,19 @@
namespace tooling {
-class LocationCall {
+class LocationCall;
+using SharedLocationCall = llvm::IntrusiveRefCntPtr<LocationCall>;
+
+class LocationCall : public llvm::ThreadSafeRefCountedBase<LocationCall> {
public:
enum LocationCallFlags { NoFlags, ReturnsPointer, IsCast };
- LocationCall(std::shared_ptr<LocationCall> on, std::string name,
+ LocationCall(SharedLocationCall on, std::string name,
LocationCallFlags flags = NoFlags)
- : m_on(on), m_name(name), m_flags(flags) {}
- LocationCall(std::shared_ptr<LocationCall> on, std::string name,
+ : m_flags(flags), m_on(std::move(on)), m_name(name) {}
+ LocationCall(SharedLocationCall on, std::string name,
std::vector<std::string> const &args,
LocationCallFlags flags = NoFlags)
- : m_on(on), m_name(name), m_flags(flags) {}
+ : m_flags(flags), m_on(std::move(on)), m_name(name) {}
LocationCall *on() const { return m_on.get(); }
StringRef name() const { return m_name; }
@@ -44,10 +46,10 @@
bool isCast() const { return m_flags & IsCast; }
private:
- std::shared_ptr<LocationCall> m_on;
+ LocationCallFlags m_flags;
+ SharedLocationCall m_on;
std::string m_name;
std::vector<std::string> m_args;
- LocationCallFlags m_flags;
};
class LocationCallFormatterCpp {
@@ -57,20 +59,20 @@
namespace internal {
struct RangeLessThan {
- bool operator()(
- std::pair<SourceRange, std::shared_ptr<LocationCall>> const &LHS,
- std::pair<SourceRange, std::shared_ptr<LocationCall>> const &RHS) const;
+ bool operator()(std::pair<SourceRange, SharedLocationCall> const &LHS,
+ std::pair<SourceRange, SharedLocationCall> const &RHS) const;
+ bool
+ operator()(std::pair<SourceLocation, SharedLocationCall> const &LHS,
+ std::pair<SourceLocation, SharedLocationCall> const &RHS) const;
};
+
} // namespace internal
-template <typename T, typename U, typename Comp = std::less<std::pair<T, U>>>
-using UniqueMultiMap = std::set<std::pair<T, U>, Comp>;
+template <typename T, typename U>
+using UniqueMultiMap = std::set<std::pair<T, U>, internal::RangeLessThan>;
-using SourceLocationMap =
- UniqueMultiMap<SourceLocation, std::shared_ptr<LocationCall>>;
-using SourceRangeMap =
- UniqueMultiMap<SourceRange, std::shared_ptr<LocationCall>,
- internal::RangeLessThan>;
+using SourceLocationMap = UniqueMultiMap<SourceLocation, SharedLocationCall>;
+using SourceRangeMap = UniqueMultiMap<SourceRange, SharedLocationCall>;
struct NodeLocationAccessors {
SourceLocationMap LocationAccessors;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
