From e893708aac04ece90fd85681c289f1a3b09b52e5 Mon Sep 17 00:00:00 2001 From: Tobias Gysi Date: Tue, 15 Jun 2021 14:36:54 +0000 Subject: [PATCH] [mlir] Avoid GCC naming conflict. Rename AbstractType to AbstractTy to avoid a GCC naming conflict after https://reviews.llvm.org/D104234. Differential Revision: https://reviews.llvm.org/D104297 --- mlir/include/mlir/IR/Attributes.h | 4 ++-- mlir/include/mlir/IR/StorageUniquerSupport.h | 6 +++--- mlir/include/mlir/IR/Types.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mlir/include/mlir/IR/Attributes.h b/mlir/include/mlir/IR/Attributes.h index 7a3adf2..590faed4 100644 --- a/mlir/include/mlir/IR/Attributes.h +++ b/mlir/include/mlir/IR/Attributes.h @@ -31,7 +31,7 @@ public: using ImplType = AttributeStorage; using ValueType = void; - using AbstractType = AbstractAttribute; + using AbstractTy = AbstractAttribute; constexpr Attribute() : impl(nullptr) {} /* implicit */ Attribute(const ImplType *impl) @@ -83,7 +83,7 @@ public: friend ::llvm::hash_code hash_value(Attribute arg); /// Return the abstract descriptor for this attribute. - const AbstractAttribute &getAbstractAttribute() const { + const AbstractTy &getAbstractAttribute() const { return impl->getAbstractAttribute(); } diff --git a/mlir/include/mlir/IR/StorageUniquerSupport.h b/mlir/include/mlir/IR/StorageUniquerSupport.h index 02498b7..a670d62 100644 --- a/mlir/include/mlir/IR/StorageUniquerSupport.h +++ b/mlir/include/mlir/IR/StorageUniquerSupport.h @@ -93,9 +93,9 @@ public: /// call will abort otherwise. template static void attachInterface(MLIRContext &context) { - typename ConcreteT::AbstractType *abstract = - ConcreteT::AbstractType::lookupMutable(TypeID::get(), - &context); + typename ConcreteT::AbstractTy *abstract = + ConcreteT::AbstractTy::lookupMutable(TypeID::get(), + &context); if (!abstract) llvm::report_fatal_error("Registering an interface for an attribute/type " "that is not itself registered."); diff --git a/mlir/include/mlir/IR/Types.h b/mlir/include/mlir/IR/Types.h index ccebce2..9aeff14 100644 --- a/mlir/include/mlir/IR/Types.h +++ b/mlir/include/mlir/IR/Types.h @@ -79,7 +79,7 @@ public: using ImplType = TypeStorage; - using AbstractType = AbstractType; + using AbstractTy = AbstractType; constexpr Type() : impl(nullptr) {} /* implicit */ Type(const ImplType *impl) @@ -170,7 +170,7 @@ public: } /// Return the abstract type descriptor for this type. - const AbstractType &getAbstractType() { return impl->getAbstractType(); } + const AbstractTy &getAbstractType() { return impl->getAbstractType(); } protected: ImplType *impl; -- 2.7.4