[Mlir-commits] [mlir] 51d30c3 - [mlir][VectorOps] Fix more GCC5 weirdness

[Benjamin Kramer]

Author: Benjamin Kramer
Date: 2020-09-08T15:41:39+02:00
New Revision: 51d30c3429fa0f46bf8c0e4a38840952c11be4f9

URL: https://github.com/llvm/llvm-project/commit/51d30c3429fa0f46bf8c0e4a38840952c11be4f9
DIFF: https://github.com/llvm/llvm-project/commit/51d30c3429fa0f46bf8c0e4a38840952c11be4f9.diff

LOG: [mlir][VectorOps] Fix more GCC5 weirdness

VectorToSCF.cpp:515:47: error: specialization of 'template<class TransferOpTy> mlir::LogicalResult mlir::VectorTransferRewriter<TransferOpTy>::matchAndRewrite(mlir::Operation*, mlir::PatternRewriter&) const' in different namespace [-fpermissive]

Added: 
    

Modified: 
    mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp b/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp
index 0a74472a49f6..c0d283d7af45 100644
--- a/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp
+++ b/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp
@@ -497,6 +497,8 @@ static void emitWithBoundsChecks(
     inBoundsFun(scalarAccessExprs);
 }
 
+namespace mlir {
+
 /// Lowers TransferReadOp into a combination of:
 ///   1. local memory allocation;
 ///   2. perfect loop nest over:
@@ -666,8 +668,6 @@ LogicalResult VectorTransferRewriter<TransferWriteOp>::matchAndRewrite(
   return success();
 }
 
-namespace mlir {
-
 void populateVectorToSCFConversionPatterns(
     OwningRewritePatternList &patterns, MLIRContext *context,
     const VectorTransferToSCFOptions &options) {