intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-03 10:39:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that the layout-override parser grabs the size, not the data

Browse Source 
size. Otherwise, we can end up with bogus layouts.

llvm-svn: 149703
This commit is contained in:
Douglas Gregor
2012-02-03 19:31:51 +00:00
parent 92afda06d7
commit 3dd5fe2006
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Frontend/LayoutOverrideSource.cpp
View File

@@ -73,10 +73,10 @@ LayoutOverrideSource::LayoutOverrideSource(llvm::StringRef Filename) {
}
// Check for the size of the type.
StringRef::size_type Pos = LineStr.find("Size:");
StringRef::size_type Pos = LineStr.find(" Size:");
if (Pos != StringRef::npos) {
// Skip past the "Size:" prefix.
LineStr = LineStr.substr(Pos + strlen("Size:"));
// Skip past the " Size:" prefix.
LineStr = LineStr.substr(Pos + strlen(" Size:"));
unsigned long long Size = 0;
(void)LineStr.getAsInteger(10, Size);

36
clang/test/CodeGenCXX/override-layout.cpp
View File

@@ -35,16 +35,30 @@ struct PACKED X3 : virtual public X1, public X0 {
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();
};
void use_structs() {
struct X0 x0;
x0.x[5] = sizeof(struct X0);
struct X1 x1;
x1.x[5] = sizeof(struct X1);
struct X2 x2;
x2.y = sizeof(struct X2);
struct X3 x3;
x3.y = sizeof(struct X3);
X0 x0s[sizeof(X0)];
X1 x1s[sizeof(X1)];
X2 x2s[sizeof(X2)];
X3 x3s[sizeof(X3)];
X4 x4s[sizeof(X4)];
x4s[1].a = 1;
}