diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 6eddebba3da..c5c16e59278 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -11436,11 +11436,11 @@ ix86_decompose_address (rtx addr, struct ix86_address *out)
 	  addr = XEXP (addr, 0);
 
 	  /* Adjust SUBREGs.  */
-	  if (GET_MODE (addr) == DImode)
-	    addr = gen_rtx_SUBREG (SImode, addr, 0);
-	  else if (GET_CODE (addr) == SUBREG
-		   && GET_MODE (SUBREG_REG (addr)) == SImode)
+	  if (GET_CODE (addr) == SUBREG
+	      && GET_MODE (SUBREG_REG (addr)) == SImode)
 	    addr = SUBREG_REG (addr);
+	  else if (GET_MODE (addr) == DImode)
+	    addr = gen_rtx_SUBREG (SImode, addr, 0);
 	  else
 	    return 0;
 	}