Merge pull request #3914 from augusto2112/calculate-stride

[lldb] Calculate stride of clang types on emplaceClangTypeInfo.

Author: augusto2112

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -664,17 +664,22 @@ SwiftLanguageRuntimeImpl::emplaceClangTypeInfo(
     m_clang_type_info.insert({clang_type.GetOpaqueQualType(), llvm::None});
     return nullptr;
   }
+  assert(*bit_align % 8 == 0 && "Bit alignment no a multiple of 8!");
+  auto byte_align = *bit_align / 8;
+  // The stride is the size rounded up to alignment.
+  size_t byte_stride = llvm::alignTo(*byte_size, byte_align);
   if (fields.empty()) {
     auto it_b = m_clang_type_info.insert(
         {clang_type.GetOpaqueQualType(),
          swift::reflection::TypeInfo(swift::reflection::TypeInfoKind::Builtin,
-                                     *byte_size, *bit_align / 8, 0, 0, true)});
+                                     *byte_size, byte_align, byte_stride, 0,
+                                     true)});
     return &*it_b.first->second;
   }
   auto it_b = m_clang_record_type_info.insert(
       {clang_type.GetOpaqueQualType(),
        swift::reflection::RecordTypeInfo(
-           *byte_size, *bit_align / 8, 0, 0, false,
+           *byte_size, byte_align, byte_stride, 0, false,
            swift::reflection::RecordKind::Struct, fields)});
   return &*it_b.first->second;
 }

lldb/test/API/lang/swift/array_bridged_enum/Makefile

@@ -0,0 +1,4 @@
+SWIFT_SOURCES := main.swift
+SWIFT_BRIDGING_HEADER := bridging-header.h
+SWIFT_OBJC_INTEROP := 1
+include Makefile.rules

lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py

@@ -0,0 +1,4 @@
+import lldbsuite.test.lldbinline as lldbinline
+from lldbsuite.test.decorators import *
+
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest, skipUnlessFoundation])

lldb/test/API/lang/swift/array_bridged_enum/bridging-header.h

@@ -0,0 +1,12 @@
+#ifndef bridging_header_h
+#define bridging_header_h
+
+#import <Foundation/Foundation.h>
+
+typedef NS_CLOSED_ENUM(NSInteger, SampleEnum) {
+    SampleEnumZero,
+    SampleEnumOne,
+    SampleEnumTwo,
+    SampleEnumThree,
+};
+#endif /* bridging_header_h */

lldb/test/API/lang/swift/array_bridged_enum/main.swift

@@ -0,0 +1,5 @@
+let array = [SampleEnum.zero, SampleEnum.one, SampleEnum.two, SampleEnum.three]
+print(array) //%self.expect('frame variable array[0]', substrs=['[0]', '.SampleEnumZero'])
+             //%self.expect('frame variable array[1]', substrs=['[1]', '.SampleEnumOne'])
+             //%self.expect('frame variable array[2]', substrs=['[2]', '.SampleEnumTwo'])
+             //FIXME: frame variable array[3] returns [.SampleEnumOne, .SampleEnumTwo]