replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Objective-C encoding. Fixes up encodeing for 

arrays of empty structs. // rdar://14053082
(also pr13062).

llvm-svn: 183234
This commit is contained in:
Fariborz Jahanian 2013-06-04 16:04:37 +00:00
parent 6f0a5edb3f
commit f0dc11ad7f
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/AST/ASTContext.cpp
View File

@ -5242,12 +5242,9 @@ void ASTContext::getObjCEncodingForTypeImpl(QualType T, std::string& S,
} else { } else {
S += '['; S += '[';
if (const ConstantArrayType *CAT = dyn_cast<ConstantArrayType>(AT)) { if (const ConstantArrayType *CAT = dyn_cast<ConstantArrayType>(AT))
if (getTypeSize(CAT->getElementType()) == 0) S += llvm::utostr(CAT->getSize().getZExtValue());
S += '0'; else {
else
S += llvm::utostr(CAT->getSize().getZExtValue());
} else {
//Variable length arrays are encoded as a regular array with 0 elements. //Variable length arrays are encoded as a regular array with 0 elements.
assert((isa<VariableArrayType>(AT) || isa<IncompleteArrayType>(AT)) && assert((isa<VariableArrayType>(AT) || isa<IncompleteArrayType>(AT)) &&
"Unknown array type!"); "Unknown array type!");

2
clang/test/CodeGenObjC/encode-test.m
View File

@ -159,7 +159,7 @@ struct f
int tt; int tt;
}; };
// CHECK: @g10 = constant [14 x i8] c"{f=i[0{?=}]i}\00" // CHECK: @g10 = constant [14 x i8] c"{f=i[4{?=}]i}\00"
const char g10[] = @encode(struct f); const char g10[] = @encode(struct f);
// rdar://9622422 // rdar://9622422