r205353 - Objective-C modern translator. Fix declaration of

Fariborz Jahanian fjahanian at apple.com
Tue Apr 1 12:32:36 PDT 2014


Author: fjahanian
Date: Tue Apr  1 14:32:35 2014
New Revision: 205353

URL: http://llvm.org/viewvc/llvm-project?rev=205353&view=rev
Log:
Objective-C modern translator. Fix declaration of
__NSConstantStringImpl's length field to accomodate
window's 64bit LLP64 mode. // rdar://16489050

Modified:
    cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp

Modified: cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp?rev=205353&r1=205352&r2=205353&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp Tue Apr  1 14:32:35 2014
@@ -6108,7 +6108,11 @@ void RewriteModernObjC::Initialize(ASTCo
   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";





More information about the cfe-commits mailing list