mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-26 14:36:08 +00:00
867c2a7d36
Summary: This patch fixes several small problems with external layouts support in `MicrosoftRecordLayoutBuilder`: - aligns properly the size of a struct that ends with a bit field. It was aligned on byte before, not on the size of the field, so the struct size was smaller than it should be; - adjusts the struct size when injecting a vbptr in the case when there were no bases or fields allocated after the vbptr. Similarly, without the adjustment the struct was smaller than it should be; - the same fix as above for the vfptr. All these fixes affect the non-virtual size of a struct, so they are tested through non-virtual inheritance. Reviewers: rnk, zturner, rsmith Reviewed By: rnk Subscribers: jdoerfert, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D58544 llvm-svn: 356047
97 lines
1.8 KiB
C++
97 lines
1.8 KiB
C++
// RUN: %clang_cc1 -w -fdump-record-layouts-simple %s > %t.layouts
|
|
// RUN: %clang_cc1 -w -fdump-record-layouts-simple %s > %t.before
|
|
// RUN: %clang_cc1 -w -DPACKED= -DALIGNED16= -fdump-record-layouts-simple -foverride-record-layout=%t.layouts %s > %t.after
|
|
// RUN: diff -u %t.before %t.after
|
|
// RUN: FileCheck %s < %t.after
|
|
|
|
// If not explicitly disabled, set PACKED to the packed attribute.
|
|
#ifndef PACKED
|
|
# define PACKED __attribute__((packed))
|
|
#endif
|
|
|
|
struct Empty1 { };
|
|
struct Empty2 { };
|
|
|
|
// CHECK: Type: struct X0
|
|
struct X0 : public Empty1 {
|
|
int x[6] PACKED;
|
|
};
|
|
|
|
// CHECK: Type: struct X1
|
|
struct X1 : public X0, public Empty2 {
|
|
char x[13];
|
|
struct X0 y;
|
|
} PACKED;
|
|
|
|
// CHECK: Type: struct X2
|
|
struct PACKED X2 : public X1, public X0, public Empty1 {
|
|
short x;
|
|
int y;
|
|
};
|
|
|
|
// CHECK: Type: struct X3
|
|
struct PACKED X3 : virtual public X1, public X0 {
|
|
short x;
|
|
int y;
|
|
};
|
|
|
|
// CHECK: Type: struct X4
|
|
struct PACKED X4 {
|
|
unsigned int a : 1;
|
|
unsigned int b : 1;
|
|
unsigned int c : 1;
|
|
unsigned int d : 1;
|
|
unsigned int e : 1;
|
|
unsigned int f : 1;
|
|
unsigned int g : 1;
|
|
unsigned int h : 1;
|
|
unsigned int i : 1;
|
|
unsigned int j : 1;
|
|
unsigned int k : 1;
|
|
unsigned int l : 1;
|
|
unsigned int m : 1;
|
|
unsigned int n : 1;
|
|
X4();
|
|
};
|
|
|
|
// CHECK: Type: struct X5
|
|
struct PACKED X5 {
|
|
union {
|
|
long a;
|
|
long b;
|
|
};
|
|
short l;
|
|
short r;
|
|
};
|
|
|
|
// CHECK: Type: struct X6
|
|
struct __attribute__((aligned(16))) X6 {
|
|
int x;
|
|
int y;
|
|
virtual ~X6();
|
|
};
|
|
|
|
// CHECK: Type: struct X7
|
|
struct X7 {
|
|
int z;
|
|
};
|
|
|
|
// CHECK: Type: struct X8
|
|
struct X8 : X6, virtual X7 {
|
|
char c;
|
|
};
|
|
|
|
void use_structs() {
|
|
X0 x0s[sizeof(X0)];
|
|
X1 x1s[sizeof(X1)];
|
|
X2 x2s[sizeof(X2)];
|
|
X3 x3s[sizeof(X3)];
|
|
X4 x4s[sizeof(X4)];
|
|
X5 x5s[sizeof(X5)];
|
|
X6 x6s[sizeof(X6)];
|
|
X7 x7s[sizeof(X7)];
|
|
X8 x8s[sizeof(X8)];
|
|
x4s[1].a = 1;
|
|
x5s[1].a = 17;
|
|
}
|