diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2014-04-01 19:32:35 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2014-04-01 19:32:35 +0000 |
| commit | 287e79a263ee3bef2a3c1ba82c681473c4fc23c9 (patch) | |
| tree | b8194250347732e69982f027c9f334e8f1218ecb | |
| parent | 9e0baa6d3ad5db4205bb779bdb67662b24b5126f (diff) | |
| download | bcm5719-llvm-287e79a263ee3bef2a3c1ba82c681473c4fc23c9.tar.gz bcm5719-llvm-287e79a263ee3bef2a3c1ba82c681473c4fc23c9.zip | |
Objective-C modern translator. Fix declaration of
__NSConstantStringImpl's length field to accomodate
window's 64bit LLP64 mode. // rdar://16489050
llvm-svn: 205353
| -rw-r--r-- | clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp b/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp index febfb9bce76..9066a5fdcb8 100644 --- a/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp +++ b/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp @@ -6108,7 +6108,11 @@ void RewriteModernObjC::Initialize(ASTContext &context) { Preamble += " int *isa;\n"; Preamble += " int flags;\n"; Preamble += " char *str;\n"; + Preamble += "#if __LLP64__\n"; + Preamble += " long long length;\n"; + Preamble += "#else\n"; Preamble += " long length;\n"; + Preamble += "#endif\n"; Preamble += "};\n"; Preamble += "#ifdef CF_EXPORT_CONSTANT_STRING\n"; Preamble += "extern \"C\" __declspec(dllexport) int __CFConstantStringClassReference[];\n"; |
