diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2009-03-26 19:10:36 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2009-03-26 19:10:36 +0000 |
| commit | dbf15cb5709067b3d23b3cdd8d014610ba4a8783 (patch) | |
| tree | 9d2021e357620aee2249644e5b8c23ecbaadab77 /lib | |
| parent | 069afd5c8c515ce483fd2f2a91daa355f66ff478 (diff) | |
- Minor change to dump of ivar layout map.
- Temporarily undef'ed __OBJC2__ in nonfragile objc abi mode
as it was forcing ivar synthesis in a certain project which clang
does not yet support.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67766 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/CGObjCMac.cpp | 5 | ||||
| -rw-r--r-- | lib/Lex/Preprocessor.cpp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp index f839374242..c15c3bb1e7 100644 --- a/lib/CodeGen/CGObjCMac.cpp +++ b/lib/CodeGen/CGObjCMac.cpp @@ -2918,7 +2918,10 @@ llvm::Constant *CGObjCCommonMac::BuildIvarLayout( printf("\nweak ivar layout: "); const unsigned char *s = (unsigned char*)BitMap.c_str(); for (unsigned i = 0; i < BitMap.size(); i++) - printf("0x%x ", s[i]); + if (!(s[i] & 0xf0)) + printf("0x0%x%s", s[i], s[i] != 0 ? ", " : ""); + else + printf("0x%x%s", s[i], s[i] != 0 ? ", " : ""); printf("\n"); return getConstantGEP(Entry, 0, 0); diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index a43bb6427e..a37b28b2b1 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -497,8 +497,12 @@ static void InitializePredefinedMacros(Preprocessor &PP, if (PP.getLangOptions().ObjC1) { DefineBuiltinMacro(Buf, "__OBJC__=1"); +#if 0 +// FIXME. This flag controls declaration of ivars which is +// needed since we do not support synthesize ivars yet. if (PP.getLangOptions().ObjCNonFragileABI) DefineBuiltinMacro(Buf, "__OBJC2__=1"); +#endif if (PP.getLangOptions().getGCMode() == LangOptions::NonGC) { DefineBuiltinMacro(Buf, "__weak="); |