diff options
| -rw-r--r-- | lib/Frontend/LayoutOverrideSource.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGenCXX/override-layout.cpp | 36 |
2 files changed, 28 insertions, 14 deletions
diff --git a/lib/Frontend/LayoutOverrideSource.cpp b/lib/Frontend/LayoutOverrideSource.cpp index 3af2cc2bbe..9cc0667850 100644 --- a/lib/Frontend/LayoutOverrideSource.cpp +++ b/lib/Frontend/LayoutOverrideSource.cpp @@ -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); diff --git a/test/CodeGenCXX/override-layout.cpp b/test/CodeGenCXX/override-layout.cpp index c09dbeff70..d432885c58 100644 --- a/test/CodeGenCXX/override-layout.cpp +++ b/test/CodeGenCXX/override-layout.cpp @@ -35,16 +35,30 @@ struct PACKED X3 : virtual public X1, public X0 { int y; }; -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); +// 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(); +}; - struct X3 x3; - x3.y = sizeof(struct X3); +void use_structs() { + X0 x0s[sizeof(X0)]; + X1 x1s[sizeof(X1)]; + X2 x2s[sizeof(X2)]; + X3 x3s[sizeof(X3)]; + X4 x4s[sizeof(X4)]; + x4s[1].a = 1; } |