r199335 - Ensure i686-nacl long long is aligned 8 bytes (like malign-double)

Jan Wen Voung jvoung at google.com
Wed Jan 15 13:42:41 PST 2014


Author: jvoung
Date: Wed Jan 15 15:42:41 2014
New Revision: 199335

URL: http://llvm.org/viewvc/llvm-project?rev=199335&view=rev
Log:
Ensure i686-nacl long long is aligned 8 bytes (like malign-double)

Set NaCl OSTargetInfo to have LongLongAlign = 64. Otherwise, it will
pick up the setting of 32 from X86_32TargetInfo.

Added:
    cfe/trunk/test/CodeGen/malign-double-x86-nacl.c   (with props)
Removed:
    cfe/trunk/test/CodeGen/long-double-x86-nacl.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=199335&r1=199334&r2=199335&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Wed Jan 15 15:42:41 2014
@@ -619,6 +619,8 @@ public:
     this->DoubleAlign = 64;
     this->LongDoubleWidth = 64;
     this->LongDoubleAlign = 64;
+    this->LongLongWidth = 64;
+    this->LongLongAlign = 64;
     this->SizeType = TargetInfo::UnsignedInt;
     this->PtrDiffType = TargetInfo::SignedInt;
     this->IntPtrType = TargetInfo::SignedInt;

Removed: cfe/trunk/test/CodeGen/long-double-x86-nacl.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/long-double-x86-nacl.c?rev=199334&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/long-double-x86-nacl.c (original)
+++ cfe/trunk/test/CodeGen/long-double-x86-nacl.c (removed)
@@ -1,7 +0,0 @@
-// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-unknown-nacl | FileCheck %s
-
-long double x = 0;
-int checksize[sizeof(x) == 8 ? 1 : -1];
-
-// CHECK-LABEL: define void @s1(double %a)
-void s1(long double a) {}

Added: cfe/trunk/test/CodeGen/malign-double-x86-nacl.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/malign-double-x86-nacl.c?rev=199335&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/malign-double-x86-nacl.c (added)
+++ cfe/trunk/test/CodeGen/malign-double-x86-nacl.c Wed Jan 15 15:42:41 2014
@@ -0,0 +1,43 @@
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-unknown-nacl | FileCheck %s
+// Check that i686-nacl essentially has -malign-double, which aligns
+// double, long double, and long long to 64-bits.
+
+int checksize[sizeof(long double) == 8 ? 1 : -1];
+int checkalign[__alignof(long double) == 8 ? 1 : -1];
+
+// CHECK-LABEL: define void @s1(double %a)
+void s1(long double a) {}
+
+struct st_ld {
+  char c;
+  long double ld;
+};
+int checksize2[sizeof(struct st_ld) == 16 ? 1 : -1];
+int checkalign2[__alignof(struct st_ld) == 8 ? 1 : -1];
+
+int checksize3[sizeof(double) == 8 ? 1 : -1];
+int checkalign3[__alignof(double) == 8 ? 1 : -1];
+
+// CHECK-LABEL: define void @s2(double %a)
+void s2(double a) {}
+
+struct st_d {
+  char c;
+  double d;
+};
+int checksize4[sizeof(struct st_d) == 16 ? 1 : -1];
+int checkalign4[__alignof(struct st_d) == 8 ? 1 : -1];
+
+
+int checksize5[sizeof(long long) == 8 ? 1 : -1];
+int checkalign5[__alignof(long long) == 8 ? 1 : -1];
+
+// CHECK-LABEL: define void @s3(i64 %a)
+void s3(long long a) {}
+
+struct st_ll {
+  char c;
+  long long ll;
+};
+int checksize6[sizeof(struct st_ll) == 16 ? 1 : -1];
+int checkalign6[__alignof(struct st_ll) == 8 ? 1 : -1];

Propchange: cfe/trunk/test/CodeGen/malign-double-x86-nacl.c
------------------------------------------------------------------------------
    svn:eol-style = LF





More information about the cfe-commits mailing list