test.

Author: terapines-osc-cir

clang/lib/CIR/Dialect/IR/CIRTypes.cpp

@@ -569,22 +569,28 @@ uint64_t RecordType::getElementOffset(const ::mlir::DataLayout &dataLayout,
   assert(idx < getNumElements());
   auto members = getMembers();
 
-  unsigned offset = 0, recordSize = 0;
+  // unsigned offset = 0, recordSize = 0;
+  unsigned offset = 0;
 
-  for (unsigned i = 0, e = idx; i != e + 1; ++i) {
+  // for (unsigned i = 0, e = idx; i != e + 1; ++i) {
+  for (unsigned i = 0, e = idx; i != e; ++i) {
     auto ty = members[i];
 
     // This matches LLVM since it uses the ABI instead of preferred alignment.
     const llvm::Align tyAlign =
         llvm::Align(getPacked() ? 1 : dataLayout.getTypeABIAlignment(ty));
 
     // Add padding if necessary to align the data element properly.
+    /*
     recordSize = llvm::alignTo(recordSize, tyAlign);
     if (i == idx)
       offset = recordSize;
+    */
+    offset = llvm::alignTo(offset, tyAlign);
 
     // Consume space for this data item
-    recordSize += dataLayout.getTypeSize(ty);
+    // recordSize += dataLayout.getTypeSize(ty);
+    offset += dataLayout.getTypeSize(ty);
   }
 
   // Account for padding, if necessary, for the alignment of the field whose

clang/test/CIR/Lowering/ThroughMLIR/struct.cir

@@ -22,4 +22,4 @@ module {
   // CHECK:   %view_0 = memref.view %[[alloca]][%[[four]]][] : memref<8xi8> to memref<i32>
   // CHECK:   return
   // CHECK: }
-}
+}