re PR target/60017 (Struct not returned correctly)

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

testsuite/ChangeLog:

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

From-SVN: r207399

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0825c365af4dbd4cded4f5001c8e6c831f064be2..9635722c9f4c0af2d7f2c98d8e2e5798e2ee8c8c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ipa-inline-analysis.c (true_predicate_p): Fix a typo in comments.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index dcf96e626a45cff4111f6f44804d179c3b66aae4..a5d65595bdedbbe453848cd2cdbdab73c2a6e8a2 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -6627,25 +6627,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 cd547e72b9238b4aeddd3325bfe937dbef298699..3cce684d9c0596288f520417efa136bf893a19ea 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-02  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR target/60017
+       * gcc.c-torture/execute/pr60017.c: New test.
+
 2014-02-02  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/57033

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;
+}