@@ -979,8 +979,8 @@ struct TestDropOpSignatureConversion : public ConversionPattern {
979
979
};
980
980
// / This pattern simply updates the operands of the given operation.
981
981
struct TestPassthroughInvalidOp : public ConversionPattern {
982
- TestPassthroughInvalidOp (MLIRContext *ctx)
983
- : ConversionPattern(" test.invalid" , 1 , ctx) {}
982
+ TestPassthroughInvalidOp (MLIRContext *ctx, const TypeConverter &converter )
983
+ : ConversionPattern(converter, " test.invalid" , 1 , ctx) {}
984
984
LogicalResult
985
985
matchAndRewrite (Operation *op, ArrayRef<Value> operands,
986
986
ConversionPatternRewriter &rewriter) const final {
@@ -1254,18 +1254,18 @@ struct TestLegalizePatternDriver
1254
1254
TestTypeConverter converter;
1255
1255
mlir::RewritePatternSet patterns (&getContext ());
1256
1256
populateWithGenerated (patterns);
1257
- patterns. add <
1258
- TestRegionRewriteBlockMovement, TestDetachedSignatureConversion,
1259
- TestRegionRewriteUndo, TestCreateBlock, TestCreateIllegalBlock,
1260
- TestUndoBlockArgReplace, TestUndoBlockErase, TestPassthroughInvalidOp ,
1261
- TestSplitReturnType, TestChangeProducerTypeI32ToF32,
1262
- TestChangeProducerTypeF32ToF64, TestChangeProducerTypeF32ToInvalid,
1263
- TestUpdateConsumerType, TestNonRootReplacement,
1264
- TestBoundedRecursiveRewrite, TestNestedOpCreationUndoRewrite,
1265
- TestReplaceEraseOp, TestCreateUnregisteredOp, TestUndoMoveOpBefore,
1266
- TestUndoPropertiesModification, TestEraseOp>(&getContext ());
1267
- patterns.add <TestDropOpSignatureConversion, TestDropAndReplaceInvalidOp>(
1268
- &getContext (), converter);
1257
+ patterns
1258
+ . add < TestRegionRewriteBlockMovement, TestDetachedSignatureConversion,
1259
+ TestRegionRewriteUndo, TestCreateBlock, TestCreateIllegalBlock,
1260
+ TestUndoBlockArgReplace, TestUndoBlockErase, TestSplitReturnType ,
1261
+ TestChangeProducerTypeI32ToF32, TestChangeProducerTypeF32ToF64 ,
1262
+ TestChangeProducerTypeF32ToInvalid, TestUpdateConsumerType ,
1263
+ TestNonRootReplacement, TestBoundedRecursiveRewrite ,
1264
+ TestNestedOpCreationUndoRewrite, TestReplaceEraseOp ,
1265
+ TestCreateUnregisteredOp, TestUndoMoveOpBefore,
1266
+ TestUndoPropertiesModification, TestEraseOp>(&getContext ());
1267
+ patterns.add <TestDropOpSignatureConversion, TestDropAndReplaceInvalidOp,
1268
+ TestPassthroughInvalidOp>( &getContext (), converter);
1269
1269
mlir::populateAnyFunctionOpInterfaceTypeConversionPattern (patterns,
1270
1270
converter);
1271
1271
mlir::populateCallOpTypeConversionPattern (patterns, converter);
@@ -1697,8 +1697,9 @@ struct TestTypeConversionAnotherProducer
1697
1697
};
1698
1698
1699
1699
struct TestReplaceWithLegalOp : public ConversionPattern {
1700
- TestReplaceWithLegalOp (MLIRContext *ctx)
1701
- : ConversionPattern(" test.replace_with_legal_op" , /* benefit=*/ 1 , ctx) {}
1700
+ TestReplaceWithLegalOp (const TypeConverter &converter, MLIRContext *ctx)
1701
+ : ConversionPattern(converter, " test.replace_with_legal_op" ,
1702
+ /* benefit=*/ 1 , ctx) {}
1702
1703
LogicalResult
1703
1704
matchAndRewrite (Operation *op, ArrayRef<Value> operands,
1704
1705
ConversionPatternRewriter &rewriter) const final {
@@ -1820,12 +1821,12 @@ struct TestTypeConversionDriver
1820
1821
1821
1822
// Initialize the set of rewrite patterns.
1822
1823
RewritePatternSet patterns (&getContext ());
1823
- patterns. add <TestTypeConsumerForward, TestTypeConversionProducer,
1824
- TestSignatureConversionUndo ,
1825
- TestTestSignatureConversionNoConverter>(converter ,
1826
- & getContext ());
1827
- patterns. add <TestTypeConversionAnotherProducer, TestReplaceWithLegalOp>(
1828
- &getContext ());
1824
+ patterns
1825
+ . add <TestTypeConsumerForward, TestTypeConversionProducer ,
1826
+ TestSignatureConversionUndo ,
1827
+ TestTestSignatureConversionNoConverter, TestReplaceWithLegalOp>(
1828
+ converter, & getContext ());
1829
+ patterns. add <TestTypeConversionAnotherProducer>( &getContext ());
1829
1830
mlir::populateAnyFunctionOpInterfaceTypeConversionPattern (patterns,
1830
1831
converter);
1831
1832
0 commit comments