From: Cameron Esfahani Date: Wed, 15 Sep 2010 00:28:12 +0000 (+0000) Subject: Fix Windows64 target info so pointer arithmetic is done correctly, and no sign extens... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1484e0da648e1aa3a68f7114bb771a6ca57f5316;p=clang 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@113910 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index df20defa0f..1896b5916b 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -1483,6 +1483,9 @@ public: IntMaxType = SignedLongLong; UIntMaxType = UnsignedLongLong; Int64Type = SignedLongLong; + SizeType = UnsignedLongLong; + PtrDiffType = SignedLongLong; + IntPtrType = SignedLongLong; } virtual void getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { diff --git a/test/CodeGen/pointer-signext.c b/test/CodeGen/pointer-signext.c new file mode 100644 index 0000000000..e6bdbcc86e --- /dev/null +++ b/test/CodeGen/pointer-signext.c @@ -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; +}