[cfe-commits] r113910 - in /cfe/trunk: lib/Basic/Targets.cpp test/CodeGen/pointer-signext.c

[Cameron Esfahani]

Author: dirty
Date: Tue Sep 14 19:28:12 2010
New Revision: 113910

URL: http://llvm.org/viewvc/llvm-project?rev=113910&view=rev
Log:
Fix Windows64 target info so pointer arithmetic is done correctly, and no sign extension code is emitted: PtrDiffType needs to be a signed long long.  Add a corresponding test case.

Added:
    cfe/trunk/test/CodeGen/pointer-signext.c
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=113910&r1=113909&r2=113910&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Tue Sep 14 19:28:12 2010
@@ -1483,6 +1483,9 @@
     IntMaxType = SignedLongLong;
     UIntMaxType = UnsignedLongLong;
     Int64Type = SignedLongLong;
+    SizeType = UnsignedLongLong;
+    PtrDiffType = SignedLongLong;
+    IntPtrType = SignedLongLong;
   }
   virtual void getTargetDefines(const LangOptions &Opts,
                                 MacroBuilder &Builder) const {

Added: cfe/trunk/test/CodeGen/pointer-signext.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/pointer-signext.c?rev=113910&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/pointer-signext.c (added)
+++ cfe/trunk/test/CodeGen/pointer-signext.c Tue Sep 14 19:28:12 2010
@@ -0,0 +1,32 @@
+// RUN: %clang_cc1 -triple x86_64-pc-win32 -emit-llvm -O2 -o - %s | FileCheck %s
+
+// Under Windows 64, int and long are 32-bits.  Make sure pointer math doesn't
+// cause any sign extensions.
+
+// CHECK: %sub.ptr.sub = add i64 %param, -8
+// CHECK: %0 = inttoptr i64 %sub.ptr.sub to %struct.anon*
+// CHECK: %tmp3 = getelementptr inbounds %struct.anon* %0, i64 0, i32 0
+
+#define CR(Record, TYPE, Field) \
+  ((TYPE *) ((unsigned char *) (Record) - (unsigned char *) &(((TYPE *) 0)->Field)))
+
+typedef struct _LIST_ENTRY {
+  struct _LIST_ENTRY  *ForwardLink;
+  struct _LIST_ENTRY  *BackLink;
+} LIST_ENTRY;
+
+typedef struct {
+  unsigned long long    Signature;
+  LIST_ENTRY            Link;
+} MEMORY_MAP;
+
+int test(unsigned long long param)
+{
+  LIST_ENTRY      *Link;
+  MEMORY_MAP      *Entry;
+
+  Link = (LIST_ENTRY *) param;
+
+  Entry = CR (Link, MEMORY_MAP, Link);
+  return (int) Entry->Signature;
+}