maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make ivar rewrite C++ friendly (since C++ forces a unified namespace for typedefs/structures). The previous version of the rewriter generated both a type def and structure def for each class (which doesn't fly in C++). 

llvm-svn: 48266
This commit is contained in:
Steve Naroff 2008-03-12 00:25:36 +00:00
parent 35f8f07c00
commit dc5b6b2e5d
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
clang/Driver/RewriteTest.cpp
View File

@ -654,11 +654,12 @@ void RewriteTest::RewriteObjCMethodDecl(ObjCMethodDecl *OMD,
if (OMD->isInstance()) { if (OMD->isInstance()) {
QualType selfTy = Context->getObjCInterfaceType(OMD->getClassInterface()); QualType selfTy = Context->getObjCInterfaceType(OMD->getClassInterface());
selfTy = Context->getPointerType(selfTy); selfTy = Context->getPointerType(selfTy);
if (ObjCSynthesizedStructs.count(OMD->getClassInterface())) if (!LangOpts.Microsoft) {
ResultStr += "struct "; if (ObjCSynthesizedStructs.count(OMD->getClassInterface()))
ResultStr += "struct ";
}
// When rewriting for Microsoft, explicitly omit the structure name.
ResultStr += OMD->getClassInterface()->getName(); ResultStr += OMD->getClassInterface()->getName();
if (LangOpts.Microsoft)
ResultStr += "_IMPL";
ResultStr += " *"; ResultStr += " *";
} }
else else
@ -759,40 +760,43 @@ void RewriteTest::RewriteInterfaceDecl(ObjCInterfaceDecl *ClassDecl) {
ReplaceText(ClassDecl->getAtEndLoc(), 0, "// ", 3); ReplaceText(ClassDecl->getAtEndLoc(), 0, "// ", 3);
} }
/// FIXME: Investigate the following comment...
/// This code is not right. It seems unnecessary. It breaks use of
/// ivar reference used as 'receiver' of an expression; as in:
/// [newInv->_container addObject:0];
Stmt *RewriteTest::RewriteObjCIvarRefExpr(ObjCIvarRefExpr *IV) { Stmt *RewriteTest::RewriteObjCIvarRefExpr(ObjCIvarRefExpr *IV) {
ObjCIvarDecl *D = IV->getDecl(); ObjCIvarDecl *D = IV->getDecl();
if (IV->isFreeIvar()) { if (CurMethodDecl) {
Expr *Replacement = new MemberExpr(IV->getBase(), true, D, if (const PointerType *pType = IV->getBase()->getType()->getAsPointerType()) {
IV->getLocation(), D->getType()); ObjCInterfaceType *intT = dyn_cast<ObjCInterfaceType>(pType->getPointeeType());
ReplaceStmt(IV, Replacement); if (CurMethodDecl->getClassInterface() == intT->getDecl()) {
delete IV; std::string RecName = intT->getDecl()->getIdentifier()->getName();
return Replacement; RecName += "_IMPL";
} else { IdentifierInfo *II = &Context->Idents.get(RecName.c_str());
#if 0 RecordDecl *RD = new RecordDecl(Decl::Struct, SourceLocation(), II, 0);
/// This code is not right. It seems unnecessary. It breaks use of assert(RD && "RewriteObjCIvarRefExpr(): Can't find RecordDecl");
/// ivar reference used as 'receiver' of an expression; as in: QualType castT = Context->getPointerType(Context->getTagDeclType(RD));
/// [newInv->_container addObject:0]; CastExpr *castExpr = new CastExpr(castT, IV->getBase(), SourceLocation());
if (CurMethodDecl) { // Don't forget the parens to enforce the proper binding.
if (const PointerType *pType = IV->getBase()->getType()->getAsPointerType()) { ParenExpr *PE = new ParenExpr(SourceLocation(), SourceLocation(), castExpr);
ObjCInterfaceType *intT = dyn_cast<ObjCInterfaceType>(pType->getPointeeType()); if (IV->isFreeIvar()) {
if (CurMethodDecl->getClassInterface() == intT->getDecl()) { MemberExpr *ME = new MemberExpr(PE, true, D, IV->getLocation(), D->getType());
IdentifierInfo *II = intT->getDecl()->getIdentifier(); ReplaceStmt(IV, ME);
RecordDecl *RD = new RecordDecl(Decl::Struct, SourceLocation(), delete IV;
II, 0); return ME;
QualType castT = Context->getPointerType(Context->getTagDeclType(RD)); } else {
CastExpr *castExpr = new CastExpr(castT, IV->getBase(), SourceLocation());
// Don't forget the parens to enforce the proper binding.
ParenExpr *PE = new ParenExpr(SourceLocation(), SourceLocation(), castExpr);
ReplaceStmt(IV->getBase(), PE); ReplaceStmt(IV->getBase(), PE);
delete IV->getBase(); delete IV->getBase();
return PE; return PE;
} }
} }
} }
#endif
return IV;
} }
Expr *Replacement = new MemberExpr(IV->getBase(), true, D,
IV->getLocation(), D->getType());
ReplaceStmt(IV, Replacement);
delete IV;
return Replacement;
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@ -2169,7 +2173,7 @@ void RewriteTest::SynthesizeObjCInternalStruct(ObjCInterfaceDecl *CDecl,
Result += CDecl->getName(); Result += CDecl->getName();
if (LangOpts.Microsoft) if (LangOpts.Microsoft)
Result += "_IMPL"; Result += "_IMPL";
if (NumIvars > 0) { if (NumIvars > 0) {
const char *cursor = strchr(startBuf, '{'); const char *cursor = strchr(startBuf, '{');
assert((cursor && endBuf) assert((cursor && endBuf)
@ -2182,6 +2186,7 @@ void RewriteTest::SynthesizeObjCInternalStruct(ObjCInterfaceDecl *CDecl,
Result += RCDecl->getName(); Result += RCDecl->getName();
if (LangOpts.Microsoft) if (LangOpts.Microsoft)
Result += "_IMPL"; Result += "_IMPL";
// Note: We don't name the field decl. This simplifies the "codegen" for // Note: We don't name the field decl. This simplifies the "codegen" for
// accessing a superclasses instance variables (and is similar to what gcc // accessing a superclasses instance variables (and is similar to what gcc
// does internally). The unnamed struct field feature is enabled with // does internally). The unnamed struct field feature is enabled with
@ -2232,6 +2237,7 @@ void RewriteTest::SynthesizeObjCInternalStruct(ObjCInterfaceDecl *CDecl,
Result += RCDecl->getName(); Result += RCDecl->getName();
if (LangOpts.Microsoft) if (LangOpts.Microsoft)
Result += "_IMPL"; Result += "_IMPL";
// Note: We don't name the field decl. This simplifies the "codegen" for // Note: We don't name the field decl. This simplifies the "codegen" for
// accessing a superclasses instance variables (and is similar to what gcc // accessing a superclasses instance variables (and is similar to what gcc
// does internally). The unnamed struct field feature is enabled with // does internally). The unnamed struct field feature is enabled with