maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Tobias Gysi 2021-06-15 14:36:54 +00:00
parent 8387187c2f
commit e893708aac
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/include/mlir/IR/Attributes.h
View File

@ -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();
}

4
mlir/include/mlir/IR/StorageUniquerSupport.h
View File

@ -93,8 +93,8 @@ public:
/// call will abort otherwise.
template <typename... IfaceModels>
static void attachInterface(MLIRContext &context) {
typename ConcreteT::AbstractType *abstract =
ConcreteT::AbstractType::lookupMutable(TypeID::get<ConcreteT>(),
typename ConcreteT::AbstractTy *abstract =
ConcreteT::AbstractTy::lookupMutable(TypeID::get<ConcreteT>(),
&context);
if (!abstract)
llvm::report_fatal_error("Registering an interface for an attribute/type "

4
mlir/include/mlir/IR/Types.h
View File

@ -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;