[Mlir-commits] [mlir] aaff3af - [mlir] [irdl] Fix order of emitted cpp namespace closing comments (#172035)

[llvmlistbot at llvm.org]

Author: Robert Konicar
Date: 2025-12-20T11:10:27+01:00
New Revision: aaff3af3b18a4f3bc31a53226b3ccbc74b45a5d6

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

LOG: [mlir] [irdl] Fix order of emitted cpp namespace closing comments (#172035)

Added: 
    

Modified: 
    mlir/lib/Target/IRDLToCpp/IRDLToCpp.cpp
    mlir/test/lib/Dialect/TestIRDLToCpp/test_irdl_to_cpp.irdl.mlir

Removed: 
    


################################################################################
diff  --git a/mlir/lib/Target/IRDLToCpp/IRDLToCpp.cpp b/mlir/lib/Target/IRDLToCpp/IRDLToCpp.cpp
index 8ecb08456da1a..b87cbb5a9aab1 100644
--- a/mlir/lib/Target/IRDLToCpp/IRDLToCpp.cpp
+++ b/mlir/lib/Target/IRDLToCpp/IRDLToCpp.cpp
@@ -711,10 +711,12 @@ irdl::translateIRDLDialectToCpp(llvm::ArrayRef<irdl::DialectOp> dialects,
     llvm::raw_string_ostream namespacePathStream(namespacePath);
     for (auto &pathElement : namespaceAbsolutePath) {
       namespaceOpenStream << "namespace " << pathElement << " {\n";
-      namespaceCloseStream << "} // namespace " << pathElement << "\n";
       namespacePathStream << "::" << pathElement;
     }
 
+    for (auto &pathElement : llvm::reverse(namespaceAbsolutePath))
+      namespaceCloseStream << "} // namespace " << pathElement << "\n";
+
     std::string cppShortName =
         llvm::convertToCamelFromSnakeCase(dialectName, true);
     std::string dialectBaseTypeName = llvm::formatv("{0}Type", cppShortName);

diff  --git a/mlir/test/lib/Dialect/TestIRDLToCpp/test_irdl_to_cpp.irdl.mlir b/mlir/test/lib/Dialect/TestIRDLToCpp/test_irdl_to_cpp.irdl.mlir
index 85fb8cb15acef..770cd36cdee33 100644
--- a/mlir/test/lib/Dialect/TestIRDLToCpp/test_irdl_to_cpp.irdl.mlir
+++ b/mlir/test/lib/Dialect/TestIRDLToCpp/test_irdl_to_cpp.irdl.mlir
@@ -1,6 +1,11 @@
 // RUN: mlir-irdl-to-cpp %s | FileCheck %s
 
+// CHECK: namespace mlir {
+// CHECK: namespace test_irdl_to_cpp {
+
 // CHECK: class TestIrdlToCpp
+// CHECK: } // namespace test_irdl_to_cpp
+// CHECK: } // namespace mlir
 irdl.dialect @test_irdl_to_cpp {
 
     // CHECK: class FooType