diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5b5c83353a3..9d386fc0d9e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+	PR middle-end/36444
+	* expmed.c (extract_bit_field_1): Check the mode size to make
+	sure the vector modes have the same size.
+
 2008-08-29  Michael Meissner  <gnu@the-meissners.org>
 
 	* dojump.c (top level): Include basic-block.h to declare
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 399139b97b5..83a8760b131 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -1204,7 +1204,7 @@ extract_bit_field_1 (rtx str_rtx, unsigned HOST_WIDE_INT bitsize,
 
       for (; new_mode != VOIDmode ; new_mode = GET_MODE_WIDER_MODE (new_mode))
 	if (GET_MODE_NUNITS (new_mode) == nunits
-	    && GET_MODE_INNER (new_mode) == tmode
+	    && GET_MODE_SIZE (new_mode) == GET_MODE_SIZE (GET_MODE (op0))
 	    && targetm.vector_mode_supported_p (new_mode))
 	  break;
       if (new_mode != VOIDmode)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5f940c11b19..405e0f37084 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+	PR middle-end/36444
+	* g++.dg/torture/pr36444.C: New testcase.
+	* gcc.c-torture/compile/vector-4.c: New testcase.
+
 2008-08-30  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libfortran/36895
diff --git a/gcc/testsuite/g++.dg/torture/pr36444.C b/gcc/testsuite/g++.dg/torture/pr36444.C
new file mode 100644
index 00000000000..fd20bde3d47
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr36444.C
@@ -0,0 +1,21 @@
+/* { dg-do compile } */
+#define vector __attribute__((vector_size(16) ))
+struct struct1  {
+  union {}    vmx;
+  struct struct2   {
+    struct2(const struct2& r) {}
+  } w;
+} __attribute__((aligned(16)));
+struct struct3  {
+  vector float vmx;
+  operator const struct1& () const{
+    return *reinterpret_cast<const struct1*>(this);
+  }
+};
+struct3 func3( struct3 V1);
+struct3 func2( void );
+void func1( )  {
+  struct1 vVec = func2() ;
+  func3 ( (struct3&)vVec );
+}
+
diff --git a/gcc/testsuite/gcc.c-torture/compile/vector-4.c b/gcc/testsuite/gcc.c-torture/compile/vector-4.c
new file mode 100644
index 00000000000..b0d8e81c82d
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/vector-4.c
@@ -0,0 +1,10 @@
+/* Make sure that vector of size 8 of signed char works. This used to crash with AVX on x86
+   as we would produce try to extract the chars inside the vector mode using the vector mode of V8SI
+   which was wrong. */
+__attribute__ ((vector_size (8))) signed char v4, v5, v6;
+void
+two (void)
+{
+ v4 = v5 + v6;
+}
+