зеркало из https://github.com/github/codeql.git
Merge pull request #13991 from github/redsun82/swift-use-concepts
Swift: use C++20 constraints and concepts to simplify code
This commit is contained in:
Paolo Tranquilli
GitHub
Коммит
6d85d0d0f7
|
|
@ -6,7 +6,7 @@ namespace codeql {
|
|||
{{#tags}}
|
||||
|
||||
// {{id}}
|
||||
struct {{name}}Tag {{#has_bases}}: {{#bases}}{{^first}}, {{/first}}{{base}}Tag{{/bases}} {{/has_bases}}{
|
||||
struct {{name}}Tag {{#has_bases}}: {{#bases}}{{^first}}, {{/first}}virtual {{base}}Tag{{/bases}} {{/has_bases}}{
|
||||
static constexpr const char* prefix = "{{name}}";
|
||||
};
|
||||
{{/tags}}
|
||||
|
|
|
|||
|
|
@ -38,19 +38,6 @@ class SwiftDispatcher {
|
|||
const swift::PoundAvailableInfo*,
|
||||
const swift::AvailabilitySpec*>;
|
||||
|
||||
template <typename E>
|
||||
static constexpr bool IsFetchable = std::is_constructible_v<Handle, const E&>;
|
||||
|
||||
template <typename E>
|
||||
static constexpr bool IsLocatable =
|
||||
std::is_base_of_v<LocatableTag, TrapTagOf<E>> && !std::is_base_of_v<TypeTag, TrapTagOf<E>>;
|
||||
|
||||
template <typename E>
|
||||
static constexpr bool IsDeclPointer = std::is_convertible_v<E, const swift::Decl*>;
|
||||
|
||||
template <typename E>
|
||||
static constexpr bool IsTypePointer = std::is_convertible_v<E, const swift::TypeBase*>;
|
||||
|
||||
public:
|
||||
// all references and pointers passed as parameters to this constructor are supposed to outlive
|
||||
// the SwiftDispatcher
|
||||
|
|
@ -76,7 +63,7 @@ class SwiftDispatcher {
|
|||
using Label = std::remove_reference_t<decltype(label)>;
|
||||
if (!label.valid()) {
|
||||
const char* action;
|
||||
if constexpr (std::is_base_of_v<typename Label::Tag, UnspecifiedElementTag>) {
|
||||
if constexpr (std::derived_from<UnspecifiedElementTag, typename Label::Tag>) {
|
||||
action = "replacing with unspecified element";
|
||||
label = emitUnspecified(idOf(entry), field, index);
|
||||
} else {
|
||||
|
|
@ -132,7 +119,7 @@ class SwiftDispatcher {
|
|||
|
||||
template <typename E>
|
||||
std::optional<TrapLabel<ElementTag>> idOf(const E& entry) {
|
||||
if constexpr (HasId<E>::value) {
|
||||
if constexpr (requires { entry.id; }) {
|
||||
return entry.id;
|
||||
} else {
|
||||
return std::nullopt;
|
||||
|
|
@ -142,14 +129,15 @@ class SwiftDispatcher {
|
|||
// This method gives a TRAP label for already emitted AST node.
|
||||
// If the AST node was not emitted yet, then the emission is dispatched to a corresponding
|
||||
// visitor (see `visit(T *)` methods below).
|
||||
template <typename E, std::enable_if_t<IsFetchable<E>>* = nullptr>
|
||||
TrapLabelOf<E> fetchLabel(const E& e, swift::Type type = {}) {
|
||||
if constexpr (std::is_constructible_v<bool, const E&>) {
|
||||
// clang-format off
|
||||
template <typename E>
|
||||
requires std::constructible_from<Handle, E*>
|
||||
TrapLabelOf<E> fetchLabel(const E* e, swift::Type type = {}) {
|
||||
// clang-format on
|
||||
if (!e) {
|
||||
// this will be treated on emission
|
||||
return undefined_label;
|
||||
}
|
||||
}
|
||||
auto& stored = store[e];
|
||||
if (!stored.valid()) {
|
||||
auto inserted = fetching.insert(e);
|
||||
|
|
@ -174,8 +162,11 @@ class SwiftDispatcher {
|
|||
return ret;
|
||||
}
|
||||
|
||||
template <typename E, std::enable_if_t<IsFetchable<E*>>* = nullptr>
|
||||
// clang-format off
|
||||
template <typename E>
|
||||
requires std::constructible_from<Handle, E*>
|
||||
TrapLabelOf<E> fetchLabel(const E& e) {
|
||||
// clang-format on
|
||||
return fetchLabel(&e);
|
||||
}
|
||||
|
||||
|
|
@ -184,7 +175,8 @@ class SwiftDispatcher {
|
|||
auto createEntry(const E& e) {
|
||||
auto found = store.find(&e);
|
||||
CODEQL_ASSERT(found != store.end(), "createEntry called on non-fetched label");
|
||||
auto label = TrapLabel<ConcreteTrapTagOf<E>>::unsafeCreateFromUntyped(found->second);
|
||||
using Tag = ConcreteTrapTagOf<E>;
|
||||
auto label = TrapLabel<Tag>::unsafeCreateFromUntyped(found->second);
|
||||
if constexpr (IsLocatable<E>) {
|
||||
locationExtractor.attachLocation(sourceManager, e, label);
|
||||
}
|
||||
|
|
@ -195,7 +187,8 @@ class SwiftDispatcher {
|
|||
// an example is swift::Argument, that are created on the fly and thus have no stable pointer
|
||||
template <typename E>
|
||||
auto createUncachedEntry(const E& e) {
|
||||
auto label = trap.createTypedLabel<TrapTagOf<E>>();
|
||||
using Tag = TrapTagOf<E>;
|
||||
auto label = trap.createTypedLabel<Tag>();
|
||||
locationExtractor.attachLocation(sourceManager, &e, label);
|
||||
return TrapClassOf<E>{label};
|
||||
}
|
||||
|
|
@ -218,7 +211,7 @@ class SwiftDispatcher {
|
|||
auto fetchRepeatedLabels(Iterable&& arg) {
|
||||
using Label = decltype(fetchLabel(*arg.begin()));
|
||||
TrapLabelVectorWrapper<typename Label::Tag> ret;
|
||||
if constexpr (HasSize<Iterable>::value) {
|
||||
if constexpr (requires { arg.size(); }) {
|
||||
ret.data.reserve(arg.size());
|
||||
}
|
||||
for (auto&& e : arg) {
|
||||
|
|
@ -251,7 +244,7 @@ class SwiftDispatcher {
|
|||
private:
|
||||
template <typename E>
|
||||
UntypedTrapLabel createLabel(const E& e, swift::Type type) {
|
||||
if constexpr (IsDeclPointer<E> || IsTypePointer<E>) {
|
||||
if constexpr (requires { name(e); }) {
|
||||
if (auto mangledName = name(e)) {
|
||||
if (shouldVisit(e)) {
|
||||
toBeVisited.emplace_back(e, type);
|
||||
|
|
@ -266,7 +259,7 @@ class SwiftDispatcher {
|
|||
|
||||
template <typename E>
|
||||
bool shouldVisit(const E& e) {
|
||||
if constexpr (IsDeclPointer<E>) {
|
||||
if constexpr (std::convertible_to<E, const swift::Decl*>) {
|
||||
encounteredModules.insert(e->getModuleContext());
|
||||
if (bodyEmissionStrategy.shouldEmitDeclBody(*e)) {
|
||||
extractedDeclaration(e);
|
||||
|
|
@ -295,18 +288,6 @@ class SwiftDispatcher {
|
|||
module->isNonSwiftModule();
|
||||
}
|
||||
|
||||
template <typename T, typename = void>
|
||||
struct HasSize : std::false_type {};
|
||||
|
||||
template <typename T>
|
||||
struct HasSize<T, decltype(std::declval<T>().size(), void())> : std::true_type {};
|
||||
|
||||
template <typename T, typename = void>
|
||||
struct HasId : std::false_type {};
|
||||
|
||||
template <typename T>
|
||||
struct HasId<T, decltype(std::declval<T>().id, void())> : std::true_type {};
|
||||
|
||||
template <typename Tag, typename... Ts>
|
||||
TrapLabel<Tag> fetchLabelFromUnion(const llvm::PointerUnion<Ts...> u) {
|
||||
TrapLabel<Tag> ret{};
|
||||
|
|
@ -324,7 +305,7 @@ class SwiftDispatcher {
|
|||
// on `BraceStmt`/`IfConfigDecl` elements), we cannot encounter a standalone `TypeRepr` there,
|
||||
// so we skip this case; extracting `TypeRepr`s here would be problematic as we would not be
|
||||
// able to provide the corresponding type
|
||||
if constexpr (!std::is_same_v<T, swift::TypeRepr*>) {
|
||||
if constexpr (!std::same_as<T, swift::TypeRepr*>) {
|
||||
if (auto e = u.template dyn_cast<T>()) {
|
||||
output = fetchLabel(e);
|
||||
return true;
|
||||
|
|
@ -348,10 +329,8 @@ class SwiftDispatcher {
|
|||
virtual void visit(const swift::TypeBase* type) = 0;
|
||||
virtual void visit(const swift::CapturedValue* capture) = 0;
|
||||
|
||||
template <typename T, std::enable_if<!std::is_base_of_v<swift::TypeRepr, T>>* = nullptr>
|
||||
void visit(const T* e, swift::Type) {
|
||||
visit(e);
|
||||
}
|
||||
template <typename T>
|
||||
requires(!std::derived_from<T, swift::TypeRepr>) void visit(const T* e, swift::Type) { visit(e); }
|
||||
|
||||
const swift::SourceManager& sourceManager;
|
||||
SwiftExtractorState& state;
|
||||
|
|
|
|||
|
|
@ -12,19 +12,24 @@
|
|||
|
||||
using namespace codeql;
|
||||
|
||||
swift::SourceRange detail::getSourceRange(const swift::Token& token) {
|
||||
const auto charRange = token.getRange();
|
||||
return {charRange.getStart(), charRange.getEnd()};
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
swift::SourceLoc start,
|
||||
swift::SourceLoc end,
|
||||
const swift::SourceRange& range,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
if (!start.isValid() || !end.isValid()) {
|
||||
if (!range) {
|
||||
// invalid locations seem to come from entities synthesized by the compiler
|
||||
return;
|
||||
}
|
||||
auto file = resolvePath(sourceManager.getDisplayNameForLoc(start));
|
||||
auto file = resolvePath(sourceManager.getDisplayNameForLoc(range.Start));
|
||||
DbLocation entry{{}};
|
||||
entry.file = fetchFileLabel(file);
|
||||
std::tie(entry.start_line, entry.start_column) = sourceManager.getLineAndColumnInBuffer(start);
|
||||
std::tie(entry.end_line, entry.end_column) = sourceManager.getLineAndColumnInBuffer(end);
|
||||
std::tie(entry.start_line, entry.start_column) =
|
||||
sourceManager.getLineAndColumnInBuffer(range.Start);
|
||||
std::tie(entry.end_line, entry.end_column) = sourceManager.getLineAndColumnInBuffer(range.End);
|
||||
SwiftMangledName locName{"loc", entry.file, ':', entry.start_line, ':', entry.start_column,
|
||||
':', entry.end_line, ':', entry.end_column};
|
||||
entry.id = trap.createTypedLabel<DbLocationTag>(locName);
|
||||
|
|
@ -43,56 +48,6 @@ TrapLabel<FileTag> SwiftLocationExtractor::emitFile(const std::filesystem::path&
|
|||
return fetchFileLabel(resolvePath(file));
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::SourceRange& range,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, range.Start, range.End, locatableLabel);
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::CapturedValue* capture,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, capture->getLoc(), locatableLabel);
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::IfConfigClause* clause,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, clause->Loc, locatableLabel);
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::AvailabilitySpec* spec,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, spec->getSourceRange(), locatableLabel);
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::KeyPathExpr::Component* component,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, component->getSourceRange().Start,
|
||||
component->getSourceRange().End, locatableLabel);
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::Token* token,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, token->getRange().getStart(), token->getRange().getEnd(),
|
||||
locatableLabel);
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
swift::SourceLoc loc,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, loc, loc, locatableLabel);
|
||||
}
|
||||
|
||||
void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::DiagnosticInfo* diagInfo,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, diagInfo->Loc, locatableLabel);
|
||||
}
|
||||
|
||||
TrapLabel<FileTag> SwiftLocationExtractor::fetchFileLabel(const std::filesystem::path& file) {
|
||||
if (store.count(file)) {
|
||||
return store[file];
|
||||
|
|
|
|||
|
|
@ -15,104 +15,99 @@ namespace codeql {
|
|||
|
||||
class TrapDomain;
|
||||
|
||||
class SwiftLocationExtractor {
|
||||
template <typename Locatable, typename = void>
|
||||
struct HasSpecializedImplementation : std::false_type {};
|
||||
namespace detail {
|
||||
template <typename T>
|
||||
concept HasSourceRange = requires(T e) {
|
||||
e.getSourceRange();
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
concept HasStartAndEndLoc = requires(T e) {
|
||||
e.getStartLoc();
|
||||
e.getEndLoc();
|
||||
}
|
||||
&&!(HasSourceRange<T>);
|
||||
|
||||
template <typename T>
|
||||
concept HasOneLoc = requires(T e) {
|
||||
e.getLoc();
|
||||
}
|
||||
&&!(HasSourceRange<T>)&&(!HasStartAndEndLoc<T>);
|
||||
|
||||
template <typename T>
|
||||
concept HasOneLocField = requires(T e) {
|
||||
e.Loc;
|
||||
};
|
||||
|
||||
swift::SourceRange getSourceRange(const HasSourceRange auto& locatable) {
|
||||
return locatable.getSourceRange();
|
||||
}
|
||||
|
||||
swift::SourceRange getSourceRange(const HasStartAndEndLoc auto& locatable) {
|
||||
if (locatable.getStartLoc() && locatable.getEndLoc()) {
|
||||
return {locatable.getStartLoc(), locatable.getEndLoc()};
|
||||
}
|
||||
return {locatable.getStartLoc()};
|
||||
}
|
||||
|
||||
swift::SourceRange getSourceRange(const HasOneLoc auto& locatable) {
|
||||
return {locatable.getLoc()};
|
||||
}
|
||||
|
||||
swift::SourceRange getSourceRange(const HasOneLocField auto& locatable) {
|
||||
return {locatable.Loc};
|
||||
}
|
||||
|
||||
swift::SourceRange getSourceRange(const swift::Token& token);
|
||||
|
||||
template <typename Locatable>
|
||||
swift::SourceRange getSourceRange(const llvm::MutableArrayRef<Locatable>& locatables) {
|
||||
if (locatables.empty()) {
|
||||
return {};
|
||||
}
|
||||
auto startRange = getSourceRange(locatables.front());
|
||||
auto endRange = getSourceRange(locatables.back());
|
||||
if (startRange.Start && endRange.End) {
|
||||
return {startRange.Start, endRange.End};
|
||||
}
|
||||
return {startRange.Start};
|
||||
}
|
||||
} // namespace detail
|
||||
|
||||
template <typename E>
|
||||
concept IsLocatable = requires(E e) {
|
||||
detail::getSourceRange(e);
|
||||
};
|
||||
|
||||
class SwiftLocationExtractor {
|
||||
public:
|
||||
explicit SwiftLocationExtractor(TrapDomain& trap) : trap(trap) {}
|
||||
|
||||
TrapLabel<FileTag> emitFile(swift::SourceFile* file);
|
||||
TrapLabel<FileTag> emitFile(const std::filesystem::path& file);
|
||||
|
||||
template <typename Locatable>
|
||||
void attachLocation(const swift::SourceManager& sourceManager,
|
||||
const Locatable& locatable,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocation(sourceManager, &locatable, locatableLabel);
|
||||
}
|
||||
|
||||
// Emits a Location TRAP entry and attaches it to a `Locatable` trap label
|
||||
template <typename Locatable,
|
||||
std::enable_if_t<!HasSpecializedImplementation<Locatable>::value>* = nullptr>
|
||||
void attachLocation(const swift::SourceManager& sourceManager,
|
||||
const Locatable* locatable,
|
||||
const IsLocatable auto& locatable,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, locatable->getStartLoc(), locatable->getEndLoc(),
|
||||
locatableLabel);
|
||||
attachLocationImpl(sourceManager, detail::getSourceRange(locatable), locatableLabel);
|
||||
}
|
||||
|
||||
template <typename Locatable,
|
||||
std::enable_if_t<HasSpecializedImplementation<Locatable>::value>* = nullptr>
|
||||
void attachLocation(const swift::SourceManager& sourceManager,
|
||||
const Locatable* locatable,
|
||||
const IsLocatable auto* locatable,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
attachLocationImpl(sourceManager, locatable, locatableLabel);
|
||||
attachLocation(sourceManager, *locatable, locatableLabel);
|
||||
}
|
||||
|
||||
private:
|
||||
// Emits a Location TRAP entry for a list of swift entities and attaches it to a `Locatable` trap
|
||||
// label
|
||||
template <typename Locatable>
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const llvm::MutableArrayRef<Locatable>* locatables,
|
||||
TrapLabel<LocatableTag> locatableLabel) {
|
||||
if (locatables->empty()) {
|
||||
return;
|
||||
}
|
||||
attachLocationImpl(sourceManager, locatables->front().getStartLoc(),
|
||||
locatables->back().getEndLoc(), locatableLabel);
|
||||
}
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
swift::SourceLoc start,
|
||||
swift::SourceLoc end,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
swift::SourceLoc loc,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::SourceRange& range,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::CapturedValue* capture,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::IfConfigClause* clause,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::AvailabilitySpec* spec,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::Token* token,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::DiagnosticInfo* token,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
void attachLocationImpl(const swift::SourceManager& sourceManager,
|
||||
const swift::KeyPathExpr::Component* component,
|
||||
TrapLabel<LocatableTag> locatableLabel);
|
||||
|
||||
private:
|
||||
TrapLabel<FileTag> fetchFileLabel(const std::filesystem::path& file);
|
||||
TrapDomain& trap;
|
||||
std::unordered_map<std::filesystem::path, TrapLabel<FileTag>, codeql::PathHash> store;
|
||||
};
|
||||
|
||||
template <typename Locatable>
|
||||
struct SwiftLocationExtractor::HasSpecializedImplementation<
|
||||
Locatable,
|
||||
decltype(std::declval<SwiftLocationExtractor>().attachLocationImpl(
|
||||
std::declval<const swift::SourceManager&>(),
|
||||
std::declval<const Locatable*>(),
|
||||
std::declval<TrapLabel<LocatableTag>>()))> : std::true_type {};
|
||||
|
||||
} // namespace codeql
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ int main() {
|
|||
std::map<const char*, std::vector<const char*>> unextracted;
|
||||
|
||||
#define CHECK_CLASS(KIND, CLASS, PARENT) \
|
||||
if (KIND##Translator::getPolicyFor##CLASS##KIND() == TranslatorPolicy::emitUnknown) { \
|
||||
if constexpr (KIND##Translator::getPolicyFor##CLASS##KIND() == TranslatorPolicy::emitUnknown) { \
|
||||
unextracted[#KIND].push_back(#CLASS #KIND); \
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <concepts>
|
||||
|
||||
#include <swift/AST/ASTVisitor.h>
|
||||
#include <swift/AST/TypeVisitor.h>
|
||||
|
||||
|
|
@ -18,45 +20,6 @@ class TranslatorBase {
|
|||
: dispatcher{dispatcher}, logger{"translator/" + std::string(name)} {}
|
||||
};
|
||||
|
||||
// define by macro metaprogramming member checkers
|
||||
// see https://fekir.info/post/detect-member-variables/ for technical details
|
||||
#define DEFINE_TRANSLATE_CHECKER(KIND, CLASS, PARENT) \
|
||||
template <typename T, typename = void> \
|
||||
struct HasTranslate##CLASS##KIND : std::false_type {}; \
|
||||
\
|
||||
template <typename T> \
|
||||
struct HasTranslate##CLASS##KIND<T, decltype((void)std::declval<T>().translate##CLASS##KIND( \
|
||||
std::declval<const swift::CLASS##KIND&>()), \
|
||||
void())> : std::true_type {};
|
||||
|
||||
DEFINE_TRANSLATE_CHECKER(Decl, , )
|
||||
#define DECL(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Decl, CLASS, PARENT)
|
||||
#define ABSTRACT_DECL(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Decl, CLASS, PARENT)
|
||||
#include "swift/AST/DeclNodes.def"
|
||||
|
||||
DEFINE_TRANSLATE_CHECKER(Stmt, , )
|
||||
#define STMT(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Stmt, CLASS, PARENT)
|
||||
#define ABSTRACT_STMT(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Stmt, CLASS, PARENT)
|
||||
#include "swift/AST/StmtNodes.def"
|
||||
|
||||
DEFINE_TRANSLATE_CHECKER(Expr, , )
|
||||
#define EXPR(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Expr, CLASS, PARENT)
|
||||
#define ABSTRACT_EXPR(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Expr, CLASS, PARENT)
|
||||
#include "swift/AST/ExprNodes.def"
|
||||
|
||||
DEFINE_TRANSLATE_CHECKER(Pattern, , )
|
||||
#define PATTERN(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Pattern, CLASS, PARENT)
|
||||
#include "swift/AST/PatternNodes.def"
|
||||
|
||||
DEFINE_TRANSLATE_CHECKER(Type, , )
|
||||
#define TYPE(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Type, CLASS, PARENT)
|
||||
#define ABSTRACT_TYPE(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(Type, CLASS, PARENT)
|
||||
#include "swift/AST/TypeNodes.def"
|
||||
|
||||
DEFINE_TRANSLATE_CHECKER(TypeRepr, , )
|
||||
#define TYPEREPR(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(TypeRepr, CLASS, PARENT)
|
||||
#define ABSTRACT_TYPEREPR(CLASS, PARENT) DEFINE_TRANSLATE_CHECKER(TypeRepr, CLASS, PARENT)
|
||||
#include "swift/AST/TypeReprNodes.def"
|
||||
} // namespace detail
|
||||
|
||||
enum class TranslatorPolicy {
|
||||
|
|
@ -76,11 +39,15 @@ enum class TranslatorPolicy {
|
|||
#define DEFINE_VISIT(KIND, CLASS, PARENT) \
|
||||
public: \
|
||||
static constexpr TranslatorPolicy getPolicyFor##CLASS##KIND() { \
|
||||
if constexpr (std::is_same_v<TrapTagOf<swift::CLASS##KIND>, void>) { \
|
||||
if constexpr (std::same_as<TrapTagOf<swift::CLASS##KIND>, void>) { \
|
||||
return TranslatorPolicy::ignore; \
|
||||
} else if constexpr (detail::HasTranslate##CLASS##KIND<CrtpSubclass>::value) { \
|
||||
} else if constexpr (requires(CrtpSubclass x, swift::CLASS##KIND e) { \
|
||||
x.translate##CLASS##KIND(e); \
|
||||
}) { \
|
||||
return TranslatorPolicy::translate; \
|
||||
} else if constexpr (detail::HasTranslate##PARENT<CrtpSubclass>::value) { \
|
||||
} else if constexpr (requires(CrtpSubclass x, swift::CLASS##KIND e) { \
|
||||
x.translate##PARENT(e); \
|
||||
}) { \
|
||||
return TranslatorPolicy::translateParent; \
|
||||
} else { \
|
||||
return TranslatorPolicy::emitUnknown; \
|
||||
|
|
@ -92,7 +59,6 @@ enum class TranslatorPolicy {
|
|||
constexpr auto policy = getPolicyFor##CLASS##KIND(); \
|
||||
if constexpr (policy == TranslatorPolicy::ignore) { \
|
||||
LOG_ERROR("Unexpected " #CLASS #KIND); \
|
||||
return; \
|
||||
} else if constexpr (policy == TranslatorPolicy::translate) { \
|
||||
dispatcher.emit(static_cast<CrtpSubclass*>(this)->translate##CLASS##KIND(*e)); \
|
||||
} else if constexpr (policy == TranslatorPolicy::translateParent) { \
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#include <binlog/binlog.hpp>
|
||||
#include <cmath>
|
||||
#include <charconv>
|
||||
#include <concepts>
|
||||
|
||||
namespace codeql {
|
||||
|
||||
|
|
@ -82,9 +83,8 @@ class TrapLabel : public UntypedTrapLabel {
|
|||
static TrapLabel unsafeCreateFromUntyped(UntypedTrapLabel label) { return TrapLabel{label.id_}; }
|
||||
|
||||
template <typename SourceTag>
|
||||
TrapLabel(const TrapLabel<SourceTag>& other) : UntypedTrapLabel(other) {
|
||||
static_assert(std::is_base_of_v<Tag, SourceTag>, "wrong label assignment!");
|
||||
}
|
||||
requires std::derived_from<SourceTag, Tag> TrapLabel(const TrapLabel<SourceTag>& other)
|
||||
: UntypedTrapLabel(other) {}
|
||||
};
|
||||
|
||||
// wrapper class to allow directly assigning a vector of TrapLabel<A> to a vector of
|
||||
|
|
@ -96,8 +96,8 @@ struct TrapLabelVectorWrapper {
|
|||
std::vector<TrapLabel<TagParam>> data;
|
||||
|
||||
template <typename DestinationTag>
|
||||
requires std::derived_from<Tag, DestinationTag>
|
||||
operator std::vector<TrapLabel<DestinationTag>>() && {
|
||||
static_assert(std::is_base_of_v<DestinationTag, Tag>, "wrong label assignment!");
|
||||
// reinterpret_cast is safe because TrapLabel instances differ only on the type, not the
|
||||
// underlying data
|
||||
return std::move(reinterpret_cast<std::vector<TrapLabel<DestinationTag>>&>(data));
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче