address review

Author: ftynse

mlir/docs/TargetLLVMIR.md

@@ -292,7 +292,7 @@ be [bufferized](Bufferization.md) before being converted.
 
 ### Conversion of LLVM Container Types with Non-Compatible Element Types
 
-Progressive lowering may result in there existing LLVM container types, such
+Progressive lowering may result in there LLVM container types, such
 as LLVM dialect structures, containing non-compatible types:
 `!llvm.struct<(index)>`. Such types are converted recursively using the rules
 described above.

mlir/lib/Conversion/LLVMCommon/TypeConverter.cpp

@@ -113,10 +113,11 @@ LLVMTypeConverter::LLVMTypeConverter(MLIRContext *ctx,
         return success();
       }
 
-      // If it has been initialized and has the same body, just use it. This
-      // ensures that recursive structs keep being recursive rather than
-      // including a non-updated name.
-      if (TypeRange(convertedType.getBody()) == TypeRange(convertedElemTypes)) {
+      // If it has been initialized, has the same body and packed bit, just use
+      // it. This ensures that recursive structs keep being recursive rather
+      // than including a non-updated name.
+      if (TypeRange(convertedType.getBody()) == TypeRange(convertedElemTypes) &&
+          convertedType.isPacked() == type.isPacked()) {
         results.push_back(convertedType);
         return success();
       }

mlir/test/Conversion/LLVMCommon/types.mlir

@@ -21,3 +21,15 @@ func.func private @create_clashes_on_conversion_recursive(!llvm.struct<"foo", (s
 // CHECK: @merge_on_conversion_recursive(!llvm.struct<"_Converted.foo", (struct<"_Converted.foo">, i64)>)
 func.func private @clashing_struct_name(!llvm.struct<"_Converted.foo", (struct<"_Converted.foo">, i64)>)
 func.func private @merge_on_conversion_recursive(!llvm.struct<"foo", (struct<"foo">, index)>)
+
+// -----
+
+// CHECK: @create_clashing_pack(!llvm.struct<"foo", packed (!llvm.struct<"foo">, index)>)
+func.func private @clashing_struct_name(!llvm.struct<"_Converted.foo", (struct<"_Converted.foo">, i64)>)
+func.func private @create_clashing_pack(!llvm.struct<"foo", packed (struct<"foo">, index)>)
+
+// -----
+
+// CHECK: @merge_on_conversion_pack(!llvm.struct<"_Converted.foo", packed (struct<"_Converted.foo">, i64)>)
+func.func private @clashing_struct_name(!llvm.struct<"_Converted.foo", packed (struct<"_Converted.foo">, i64)>)
+func.func private @merge_on_conversion_pack(!llvm.struct<"foo", packed (struct<"foo">, index)>)