backport: re PR target/60017 (Struct not returned correctly)

	Backport from mainline
	2014-02-02  Uros Bizjak  <ubizjak@gmail.com>

	PR target/60017
	* config/i386/i386.c (classify_argument): Fix handling of bit_offset
	when calculating size of integer atomic types.

testsuite/ChangeLog

	Backport from mainline
	2014-02-02  Uros Bizjak  <ubizjak@gmail.com>

	PR target/60017
	* gcc.c-torture/execute/pr60017.c: New test.

From-SVN: r207476

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 77d5124ec1e464cabc67cbe406f2d8eba518acf0..446ca4ab8dcab6c8e9b02497ce3059f39999b6a9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-04  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline
+       2014-02-02  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR target/60017
+       * config/i386/i386.c (classify_argument): Fix handling of bit_offset
+       when calculating size of integer atomic types.
+
 2014-02-02  Uros Bizjak  <ubizjak@gmail.com>
 
        Backport from mainline

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 447f6f27f144eb8889e414a123ad12a4682ee5cb..25ec81420538b2bff04655ef2c8f964fea924b02 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -6078,25 +6078,28 @@ classify_argument (enum machine_mode mode, const_tree type,
     case CHImode:
     case CQImode:
       {
-       int size = (bit_offset % 64)+ (int) GET_MODE_BITSIZE (mode);
+       int size = bit_offset + (int) GET_MODE_BITSIZE (mode);
 
-       if (size <= 32)
+       /* Analyze last 128 bits only.  */
+       size = (size - 1) & 0x7f;
+
+       if (size < 32)
          {
            classes[0] = X86_64_INTEGERSI_CLASS;
            return 1;
          }
-       else if (size <= 64)
+       else if (size < 64)
          {
            classes[0] = X86_64_INTEGER_CLASS;
            return 1;
          }
-       else if (size <= 64+32)
+       else if (size < 64+32)
          {
            classes[0] = X86_64_INTEGER_CLASS;
            classes[1] = X86_64_INTEGERSI_CLASS;
            return 2;
          }
-       else if (size <= 64+64)
+       else if (size < 64+64)
          {
            classes[0] = classes[1] = X86_64_INTEGER_CLASS;
            return 2;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8ede531afba3a5197ef49c922712bbe979b5aac3..ac13876f53c5b48f89e7aadc0748984a4db9a90c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-04  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline
+       2014-02-02  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR target/60017
+       * gcc.c-torture/execute/pr60017.c: New test.
+
 2014-02-03  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/59941

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr60017.c b/gcc/testsuite/gcc.c-torture/execute/pr60017.c
new file mode 100644 (file)
index 0000000..d72c12c
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr60017.c
@@ -0,0 +1,33 @@
+/* PR target/60017 */
+
+extern void abort (void);
+
+struct S0
+{
+  short m0;
+  short m1;
+};
+
+struct S1
+{
+  unsigned m0:1;
+  char m1[2][2];
+  struct S0 m2[2];
+};
+
+struct S1 x = { 1, {{2, 3}, {4, 5}}, {{6, 7}, {8, 9}} };
+
+struct S1 func (void)
+{
+  return x;
+}
+
+int main (void)
+{
+  struct S1 ret = func ();
+
+  if (ret.m2[1].m1 != 9)
+    abort ();
+
+  return 0;
+}