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

[mlir] Avoid the use of auto in templates to fix MSVC build 

MSVC is unable to deduce template types when the type involves auto.
This commit is contained in:
River Riddle 2020-03-16 13:55:16 -07:00
parent 78d622a48c
commit 2d723d4ad5
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mlir/tools/mlir-tblgen/DialectGen.cpp
View File

@ -36,14 +36,23 @@ static llvm::cl::opt<std::string>
selectedDialect("dialect", llvm::cl::desc("The dialect to gen for"), selectedDialect("dialect", llvm::cl::desc("The dialect to gen for"),
llvm::cl::cat(dialectGenCat), llvm::cl::CommaSeparated); llvm::cl::cat(dialectGenCat), llvm::cl::CommaSeparated);
/// Utility iterator used for filtering records for a specific dialect.
namespace {
using DialectFilterIterator =
llvm::filter_iterator<ArrayRef<llvm::Record *>::iterator,
std::function<bool(const llvm::Record *)>>;
} // end anonymous namespace
/// Given a set of records for a T, filter the ones that correspond to /// Given a set of records for a T, filter the ones that correspond to
/// the given dialect. /// the given dialect.
template <typename T> template <typename T>
static auto filterForDialect(ArrayRef<llvm::Record *> records, static iterator_range<DialectFilterIterator>
Dialect &dialect) { filterForDialect(ArrayRef<llvm::Record *> records, Dialect &dialect) {
return llvm::make_filter_range(records, [&](const llvm::Record *record) { auto filterFn = [&](const llvm::Record *record) {
return T(record).getDialect() == dialect; return T(record).getDialect() == dialect;
}); };
return {DialectFilterIterator(records.begin(), records.end(), filterFn),
DialectFilterIterator(records.end(), records.end(), filterFn)};
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@ -93,12 +102,10 @@ static const char *const constantMaterializerDecl = R"(
)"; )";
/// Generate the declaration for the given dialect class. /// Generate the declaration for the given dialect class.
static void emitDialectDecl( static void emitDialectDecl(Dialect &dialect,
Dialect &dialect, iterator_range<DialectFilterIterator> dialectAttrs,
FunctionTraits<decltype(&filterForDialect<Attribute>)>::result_t iterator_range<DialectFilterIterator> dialectTypes,
dialectAttrs, raw_ostream &os) {
FunctionTraits<decltype(&filterForDialect<Type>)>::result_t dialectTypes,
raw_ostream &os) {
// Emit the start of the decl. // Emit the start of the decl.
std::string cppName = dialect.getCppClassName(); std::string cppName = dialect.getCppClassName();
os << llvm::formatv(dialectDeclBeginStr, cppName, dialect.getName()); os << llvm::formatv(dialectDeclBeginStr, cppName, dialect.getName());