Author: bwilson
Date: Tue Jun 18 00:36:04 2013
New Revision: 184171

URL: http://llvm.org/viewvc/llvm-project?rev=184171&view=rev
Log:
size_t on Darwin AAPCS targets is "unsigned long". <rdar://problem/14136459>

Some embedded targets use ARM's AAPCS with iOS header files that define size_t
as unsigned long, which conflicts with the usual AAPCS definition of size_t
as unsigned int.

Added:
    cfe/trunk/test/Sema/arm-darwin-aapcs.cpp
Modified:
    cfe/trunk/lib/Basic/Targets.cpp

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=184171&r1=184170&r2=184171&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Tue Jun 18 00:36:04 2013
@@ -3642,6 +3642,9 @@ public:
 
       // FIXME: Override "preferred align" for double and long long.
     } else if (Name == "aapcs" || Name == "aapcs-vfp") {
+      // size_t is unsigned long on Darwin.
+      if (getTriple().isOSDarwin())
+        SizeType = UnsignedLong;
       IsAAPCS = true;
       // FIXME: Enumerated types are variable width in straight AAPCS.
     } else if (Name == "aapcs-linux") {

Added: cfe/trunk/test/Sema/arm-darwin-aapcs.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/arm-darwin-aapcs.cpp?rev=184171&view=auto
==============================================================================
--- cfe/trunk/test/Sema/arm-darwin-aapcs.cpp (added)
+++ cfe/trunk/test/Sema/arm-darwin-aapcs.cpp Tue Jun 18 00:36:04 2013
@@ -0,0 +1,12 @@
+// RUN: %clang_cc1 %s -triple thumbv7-apple-ios -target-abi aapcs -verify 
-fsyntax-only
+// expected-no-diagnostics
+
+// ARM's AAPCS normally has size_t defined as unsigned int, but on Darwin
+// some embedded targets use AAPCS with the iOS header files, which define
+// size_t as unsigned long.  Make sure that works.
+typedef unsigned long size_t;
+void* malloc(size_t);
+void* operator new(size_t size)
+{
+  return (malloc(size));
+}


_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

Reply via email to