PR 53379 Print backtrace on error termination.

[gcc.git] / libgfortran / runtime / in_unpack_generic.c

diff --git a/libgfortran/runtime/in_unpack_generic.c b/libgfortran/runtime/in_unpack_generic.c
index 32cc94b1169d0451a749f383e393bf0b691fe3c6..179d6ff56a57632a7d07d4511c69715bc90a156f 100644 (file)
--- a/libgfortran/runtime/in_unpack_generic.c
+++ b/libgfortran/runtime/in_unpack_generic.c
@@ -1,9 +1,8 @@
 /* Generic helper function for repacking arrays.
-   Copyright 2003, 2004, 2005, 2007, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2003-2015 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
-This file is part of the GNU Fortran 95 runtime library (libgfortran).
+This file is part of the GNU Fortran runtime library (libgfortran).
 
 Libgfortran is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public
@@ -47,7 +46,7 @@ internal_unpack (gfc_array_char * d, const void * s)
   int size;
   int type_size;
 
-  dest = d->data;
+  dest = d->base_addr;
   /* This check may be redundant, but do it anyway.  */
   if (s == dest || !s)
     return;
@@ -140,7 +139,7 @@ internal_unpack (gfc_array_char * d, const void * s)
 #endif
 
     case GFC_DTYPE_DERIVED_2:
-      if (GFC_UNALIGNED_2(d->data) || GFC_UNALIGNED_2(s))
+      if (GFC_UNALIGNED_2(d->base_addr) || GFC_UNALIGNED_2(s))
        break;
       else
        {
@@ -148,7 +147,7 @@ internal_unpack (gfc_array_char * d, const void * s)
          return;
        }
     case GFC_DTYPE_DERIVED_4:
-      if (GFC_UNALIGNED_4(d->data) || GFC_UNALIGNED_4(s))
+      if (GFC_UNALIGNED_4(d->base_addr) || GFC_UNALIGNED_4(s))
        break;
       else
        {
@@ -157,7 +156,7 @@ internal_unpack (gfc_array_char * d, const void * s)
        }
 
     case GFC_DTYPE_DERIVED_8:
-      if (GFC_UNALIGNED_8(d->data) || GFC_UNALIGNED_8(s))
+      if (GFC_UNALIGNED_8(d->base_addr) || GFC_UNALIGNED_8(s))
        break;
       else
        {
@@ -167,7 +166,7 @@ internal_unpack (gfc_array_char * d, const void * s)
 
 #ifdef HAVE_GFC_INTEGER_16
     case GFC_DTYPE_DERIVED_16:
-      if (GFC_UNALIGNED_16(d->data) || GFC_UNALIGNED_16(s))
+      if (GFC_UNALIGNED_16(d->base_addr) || GFC_UNALIGNED_16(s))
        break;
       else
        {