diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 6ec73f6d51a91ac6e544654d52fab975da178242..96b75e9292add7cb92c4713a4f06e79016b644e6 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,20 @@
+2017-03-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR libfortran/79956
+	* m4/reshape.m4 (reshape_'rtype_ccode`):  Correct use
+	of GFC_ASSERT.
+	* generated/reshape_c10.c: Regenerated.
+	* generated/reshape_c16.c: Regenerated.
+	* generated/reshape_c4.c: Regenerated.
+	* generated/reshape_c8.c: Regenerated.
+	* generated/reshape_i16.c: Regenerated.
+	* generated/reshape_i4.c: Regenerated.
+	* generated/reshape_i8.c: Regenerated.
+	* generated/reshape_r10.c: Regenerated.
+	* generated/reshape_r16.c: Regenerated.
+	* generated/reshape_r4.c: Regenerated.
+	* generated/reshape_r8.c: Regenerated.
+
 2017-03-15  NightStrike  <nightstrike@gmail.com>
 	    Janne Blomqvist  <jb@gcc.gnu.org>
 
diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c
index af45e960ee7fae71e84fe1ade12eae4bcc306ab4..ce6c9a256dc4ac910806ffa3b1c15e1a9b376f74 100644
--- a/libgfortran/generated/reshape_c10.c
+++ b/libgfortran/generated/reshape_c10.c
@@ -80,7 +80,7 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c
index 977a53dbe475f1e8fd083692f666e92d6112f0a8..4ca6722433e304f2c1be99285c93a544398bb17f 100644
--- a/libgfortran/generated/reshape_c16.c
+++ b/libgfortran/generated/reshape_c16.c
@@ -80,7 +80,7 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_c4.c b/libgfortran/generated/reshape_c4.c
index fd94689a4c0b7d393820e70f0f5328f9a574af64..dc1b8ee6c74e697acedfc536927e39065e21e5dd 100644
--- a/libgfortran/generated/reshape_c4.c
+++ b/libgfortran/generated/reshape_c4.c
@@ -80,7 +80,7 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_c8.c b/libgfortran/generated/reshape_c8.c
index 6377049397b002e5527ce69da9a77ef908c84728..88d03d731484e19f479c498dc4fa322dc0f6d7b9 100644
--- a/libgfortran/generated/reshape_c8.c
+++ b/libgfortran/generated/reshape_c8.c
@@ -80,7 +80,7 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c
index 65576a31704b118f5c6126650b72df97188ed0d8..fd5e8e7e736384e0c9add7f4470e45027f850819 100644
--- a/libgfortran/generated/reshape_i16.c
+++ b/libgfortran/generated/reshape_i16.c
@@ -80,7 +80,7 @@ reshape_16 (gfc_array_i16 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c
index d07b3a9c2d108a254794734a01a41b350dd02fa5..149d18575eb8d908696e156107e6e1b705ef29cd 100644
--- a/libgfortran/generated/reshape_i4.c
+++ b/libgfortran/generated/reshape_i4.c
@@ -80,7 +80,7 @@ reshape_4 (gfc_array_i4 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c
index f48728d17be7ecc9ea30c9d09ed09d8db4098e8b..a4c95a24b7a00560347269ecf09d579175440862 100644
--- a/libgfortran/generated/reshape_i8.c
+++ b/libgfortran/generated/reshape_i8.c
@@ -80,7 +80,7 @@ reshape_8 (gfc_array_i8 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_r10.c b/libgfortran/generated/reshape_r10.c
index a5722d4244f69562414fb5512d857c6cb9d22a07..47e803fd562a4f64aa3e850d7e5768aeb29571ed 100644
--- a/libgfortran/generated/reshape_r10.c
+++ b/libgfortran/generated/reshape_r10.c
@@ -80,7 +80,7 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_r16.c b/libgfortran/generated/reshape_r16.c
index c56b8717a839c973455e6d32abedc8a1bcc239aa..c210dfdef52aacee4d3ff408212687f351477a63 100644
--- a/libgfortran/generated/reshape_r16.c
+++ b/libgfortran/generated/reshape_r16.c
@@ -80,7 +80,7 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_r4.c b/libgfortran/generated/reshape_r4.c
index 889813c07ece69594551673793a69fa06ac98f77..a4f9b07f55c78c07fdb6b5eebf6ddfb83b37222b 100644
--- a/libgfortran/generated/reshape_r4.c
+++ b/libgfortran/generated/reshape_r4.c
@@ -80,7 +80,7 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/generated/reshape_r8.c b/libgfortran/generated/reshape_r8.c
index 279f89dcf2cdcea627d3cc876cb6763193b80666..955463c4645006bd05369b3ca7aec070522359e3 100644
--- a/libgfortran/generated/reshape_r8.c
+++ b/libgfortran/generated/reshape_r8.c
@@ -80,7 +80,7 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");
diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4
index 5ad1f13615319cec50fd077d7780c0c3d27e3fef..346d5389a104aecb84d682d369ee6e5f28b6a3c1 100644
--- a/libgfortran/m4/reshape.m4
+++ b/libgfortran/m4/reshape.m4
@@ -84,7 +84,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
   rdim = GFC_DESCRIPTOR_EXTENT(shape,0);
   /* rdim is always > 0; this lets the compiler optimize more and
    avoids a potential warning.  */
-  GFC_ASSERT(sdim>0);
+  GFC_ASSERT(rdim>0);
 
   if (rdim != GFC_DESCRIPTOR_RANK(ret))
     runtime_error("rank of return array incorrect in RESHAPE intrinsic");