From FEDORA_PATCHES Mon Sep 17 00:00:00 2001

From: Fedora GDB patches <invalid@email.com>

Date: Fri, 27 Oct 2017 21:07:50 +0200

Subject: gdb-vla-intel-fortran-vla-strings.patch

;;=push

git diff --stat -p gdb/master...gdb/users/bheckel/fortran-vla-strings

0ad7d8d1a3a36c6e04e3b6d37d8825f18d595723

 gdb/NEWS                                  |   2 +

 gdb/c-valprint.c                          |  22 +++++

 gdb/dwarf2read.c                          | 158 +++++++++++++++++++++++++-----

 gdb/f-typeprint.c                         |  93 +++++++++---------

 gdb/gdbtypes.c                            |  44 ++++++++-

 gdb/testsuite/gdb.cp/vla-cxx.cc           |   9 ++

 gdb/testsuite/gdb.cp/vla-cxx.exp          |   9 ++

 gdb/testsuite/gdb.fortran/pointers.exp    | 143 +++++++++++++++++++++++++++

 gdb/testsuite/gdb.fortran/pointers.f90    | 109 +++++++++++++++++++++

 gdb/testsuite/gdb.fortran/print_type.exp  | 100 +++++++++++++++++++

 gdb/testsuite/gdb.fortran/vla-ptype.exp   |  12 +--

 gdb/testsuite/gdb.fortran/vla-strings.exp | 103 +++++++++++++++++++

 gdb/testsuite/gdb.fortran/vla-strings.f90 |  39 ++++++++

 gdb/testsuite/gdb.fortran/vla-type.exp    |   7 +-

 gdb/testsuite/gdb.fortran/vla-value.exp   |  12 ++-

 gdb/testsuite/gdb.mi/mi-var-child-f.exp   |   7 +-

 gdb/testsuite/gdb.mi/mi-vla-fortran.exp   |  27 ++---

 gdb/typeprint.c                           |  19 ++++

 gdb/valops.c                              |  16 ++-

 gdb/valprint.c                            |   6 --

 20 files changed, 827 insertions(+), 110 deletions(-)

diff --git a/gdb/NEWS b/gdb/NEWS

--- a/gdb/NEWS

+++ b/gdb/NEWS

@@ -336,6 +336,8 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*

 *** Changes in GDB 8.1

+* Fortran: Support pointers to dynamic types.

+

 * GDB now supports dynamically creating arbitrary register groups specified

   in XML target descriptions.  This allows for finer grain grouping of

   registers on systems with a large amount of registers.

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c

--- a/gdb/c-valprint.c

+++ b/gdb/c-valprint.c

@@ -653,6 +653,28 @@ c_value_print (struct value *val, struct ui_file *stream,

       else

 	{

 	  /* normal case */

+	  if (TYPE_CODE (type) == TYPE_CODE_PTR

+	      && 1 == is_dynamic_type (type))

+	    {

+	      CORE_ADDR addr;

+	      if (NULL != TYPE_DATA_LOCATION (TYPE_TARGET_TYPE (type)))

+		addr = value_address (val);

+	      else

+		addr = value_as_address (val);

+

+	      /* We resolve the target-type only when the

+	         pointer is associated.  */

+	      if ((addr != 0)

+		  && (0 == type_not_associated (type)))

+		  TYPE_TARGET_TYPE (type) =

+		      resolve_dynamic_type (TYPE_TARGET_TYPE (type),

+					    NULL, addr);

+	    }

+	  else

+	    {

+	      /* Do nothing. References are already resolved from the beginning,

+	         only pointers are resolved when we actual need the target.  */

+	    }

 	  fprintf_filtered (stream, "(");

 	  type_print (value_type (val), "", stream, -1);

 	  fprintf_filtered (stream, ") ");

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c

--- a/gdb/dwarf2read.c

+++ b/gdb/dwarf2read.c

@@ -1833,7 +1833,8 @@ static void read_signatured_type (struct signatured_type *);

 static int attr_to_dynamic_prop (const struct attribute *attr,

 				 struct die_info *die, struct dwarf2_cu *cu,

-				 struct dynamic_prop *prop);

+				 struct dynamic_prop *prop, const gdb_byte *additional_data,

+				 int additional_data_size);

 /* memory allocation interface */

@@ -13757,7 +13758,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)

     {

       newobj->static_link

 	= XOBNEW (&objfile->objfile_obstack, struct dynamic_prop);

-      attr_to_dynamic_prop (attr, die, cu, newobj->static_link);

+      attr_to_dynamic_prop (attr, die, cu, newobj->static_link, NULL, 0);

     }

   cu->list_in_scope = cu->get_builder ()->get_local_symbols ();

@@ -16516,7 +16517,8 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)

       byte_stride_prop

 	= (struct dynamic_prop *) alloca (sizeof (struct dynamic_prop));

-      stride_ok = attr_to_dynamic_prop (attr, die, cu, byte_stride_prop);

+      stride_ok = attr_to_dynamic_prop (attr, die, cu, byte_stride_prop,

+					NULL, 0);

       if (!stride_ok)

 	{

 	  complaint (_("unable to read array DW_AT_byte_stride "

@@ -17277,29 +17279,90 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)

   struct gdbarch *gdbarch = get_objfile_arch (objfile);

   struct type *type, *range_type, *index_type, *char_type;

   struct attribute *attr;

-  unsigned int length;

+  unsigned int length = UINT_MAX;

+

+  index_type = objfile_type (objfile)->builtin_int;

+  range_type = create_static_range_type (NULL, index_type, 1, length);

+  /* If DW_AT_string_length is defined, the length is stored in memory.  */

   attr = dwarf2_attr (die, DW_AT_string_length, cu);

   if (attr)

     {

-      length = DW_UNSND (attr);

+      if (attr_form_is_block (attr))

+	{

+	  struct attribute *byte_size, *bit_size;

+	  struct dynamic_prop high;

+

+	  byte_size = dwarf2_attr (die, DW_AT_byte_size, cu);

+	  bit_size = dwarf2_attr (die, DW_AT_bit_size, cu);

+

+	  /* DW_AT_byte_size should never occur in combination with

+	     DW_AT_bit_size.  */

+	  if (byte_size != NULL && bit_size != NULL)

+	    complaint (_("DW_AT_byte_size AND "

+			 "DW_AT_bit_size found together at the same time."));

+

+	  /* If DW_AT_string_length AND DW_AT_byte_size exist together,

+	     DW_AT_byte_size describes the number of bytes that should be read

+	     from the length memory location.  */

+	  if (byte_size != NULL)

+	    {

+	      /* Build new dwarf2_locexpr_baton structure with additions to the

+		 data attribute, to reflect DWARF specialities to get address

+		 sizes.  */

+	      const gdb_byte append_ops[] =

+		{

+		/* DW_OP_deref_size: size of an address on the target machine

+		   (bytes), where the size will be specified by the next

+		   operand.  */

+		DW_OP_deref_size,

+		/* Operand for DW_OP_deref_size.  */

+		(gdb_byte) DW_UNSND(byte_size) };

+

+	      if (!attr_to_dynamic_prop (attr, die, cu, &high, append_ops,

+					 ARRAY_SIZE(append_ops)))

+		complaint (_("Could not parse DW_AT_byte_size"));

+	    }

+	  else if (bit_size != NULL)

+	    complaint (_("DW_AT_string_length AND "

+			 "DW_AT_bit_size found but not supported yet."));

+	  /* If DW_AT_string_length WITHOUT DW_AT_byte_size exist, the default

+	     is the address size of the target machine.  */

+	  else

+	    {

+	      const gdb_byte append_ops[] =

+		{ DW_OP_deref };

+

+	      if (!attr_to_dynamic_prop (attr, die, cu, &high, append_ops,

+					 ARRAY_SIZE(append_ops)))

+		complaint (_("Could not parse DW_AT_string_length"));

+	    }

+

+	  TYPE_RANGE_DATA (range_type)->high = high;

+	}

+      else

+	{

+	  TYPE_HIGH_BOUND (range_type) = DW_UNSND(attr);

+	  TYPE_HIGH_BOUND_KIND (range_type) = PROP_CONST;

+	}

     }

   else

     {

-      /* Check for the DW_AT_byte_size attribute.  */

+      /* Check for the DW_AT_byte_size attribute, which represents the length

+	 in this case.  */

       attr = dwarf2_attr (die, DW_AT_byte_size, cu);

       if (attr)

-        {

-          length = DW_UNSND (attr);

-        }

+	{

+	  TYPE_HIGH_BOUND (range_type) = DW_UNSND(attr);

+	  TYPE_HIGH_BOUND_KIND (range_type) = PROP_CONST;

+	}

       else

-        {

-          length = 1;

-        }

+	{

+	  TYPE_HIGH_BOUND (range_type) = 1;

+	  TYPE_HIGH_BOUND_KIND (range_type) = PROP_CONST;

+	}

     }

-  index_type = objfile_type (objfile)->builtin_int;

-  range_type = create_static_range_type (NULL, index_type, 1, length);

   char_type = language_string_char_type (cu->language_defn, gdbarch);

   type = create_string_type (NULL, char_type, range_type);

@@ -17667,7 +17730,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)

 static int

 attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,

-		      struct dwarf2_cu *cu, struct dynamic_prop *prop)

+		      struct dwarf2_cu *cu, struct dynamic_prop *prop,

+		      const gdb_byte *additional_data, int additional_data_size)

 {

   struct dwarf2_property_baton *baton;

   struct obstack *obstack

@@ -17678,14 +17742,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,

   if (attr_form_is_block (attr))

     {

-      baton = XOBNEW (obstack, struct dwarf2_property_baton);

+      baton = XOBNEW(obstack, struct dwarf2_property_baton);

       baton->referenced_type = NULL;

       baton->locexpr.per_cu = cu->per_cu;

-      baton->locexpr.size = DW_BLOCK (attr)->size;

-      baton->locexpr.data = DW_BLOCK (attr)->data;

+

+      if (additional_data != NULL && additional_data_size > 0)

+	{

+	  gdb_byte *data;

+

+	  data = (gdb_byte *) obstack_alloc(

+	      &cu->per_cu->dwarf2_per_objfile->objfile->objfile_obstack,

+	      DW_BLOCK (attr)->size + additional_data_size);

+	  memcpy (data, DW_BLOCK (attr)->data, DW_BLOCK (attr)->size);

+	  memcpy (data + DW_BLOCK (attr)->size, additional_data,

+		  additional_data_size);

+

+	  baton->locexpr.data = data;

+	  baton->locexpr.size = DW_BLOCK (attr)->size + additional_data_size;

+	}

+      else

+	{

+	  baton->locexpr.data = DW_BLOCK (attr)->data;

+	  baton->locexpr.size = DW_BLOCK (attr)->size;

+	}

+

       prop->data.baton = baton;

       prop->kind = PROP_LOCEXPR;

-      gdb_assert (prop->data.baton != NULL);

+      gdb_assert(prop->data.baton != NULL);

     }

   else if (attr_form_is_ref (attr))

     {

@@ -17718,8 +17801,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,

 		baton = XOBNEW (obstack, struct dwarf2_property_baton);

 		baton->referenced_type = die_type (target_die, target_cu);

 		baton->locexpr.per_cu = cu->per_cu;

-		baton->locexpr.size = DW_BLOCK (target_attr)->size;

-		baton->locexpr.data = DW_BLOCK (target_attr)->data;

+

+		if (additional_data != NULL && additional_data_size > 0)

+		  {

+		    gdb_byte *data;

+

+		    data = (gdb_byte *) obstack_alloc (&cu->per_cu->dwarf2_per_objfile->objfile->objfile_obstack,

+			    DW_BLOCK (target_attr)->size + additional_data_size);

+		    memcpy (data, DW_BLOCK (target_attr)->data,

+			    DW_BLOCK (target_attr)->size);

+		    memcpy (data + DW_BLOCK (target_attr)->size,

+			    additional_data, additional_data_size);

+

+		    baton->locexpr.data = data;

+		    baton->locexpr.size = (DW_BLOCK (target_attr)->size

+					   + additional_data_size);

+		  }

+		else

+		  {

+		    baton->locexpr.data = DW_BLOCK (target_attr)->data;

+		    baton->locexpr.size = DW_BLOCK (target_attr)->size;

+		  }

+

 		prop->data.baton = baton;

 		prop->kind = PROP_LOCEXPR;

 		gdb_assert (prop->data.baton != NULL);

@@ -17830,7 +17933,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)

   attr = dwarf2_attr (die, DW_AT_byte_stride, cu);

   if (attr)

-    if (!attr_to_dynamic_prop (attr, die, cu, &stride))

+    if (!attr_to_dynamic_prop (attr, die, cu, &stride, NULL, 0))

         complaint (_("Missing DW_AT_byte_stride "

 		     "- DIE at 0x%s [in module %s]"),

 		   sect_offset_str (die->sect_off),

@@ -17838,7 +17941,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)

   attr = dwarf2_attr (die, DW_AT_lower_bound, cu);

   if (attr)

-    attr_to_dynamic_prop (attr, die, cu, &low);

+    attr_to_dynamic_prop (attr, die, cu, &low, NULL, 0);

   else if (!low_default_is_valid)

     complaint (_("Missing DW_AT_lower_bound "

 				      "- DIE at %s [in module %s]"),

@@ -17847,10 +17950,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)

   struct attribute *attr_ub, *attr_count;

   attr = attr_ub = dwarf2_attr (die, DW_AT_upper_bound, cu);

-  if (!attr_to_dynamic_prop (attr, die, cu, &high))

+  if (!attr_to_dynamic_prop (attr, die, cu, &high, NULL, 0))

     {

       attr = attr_count = dwarf2_attr (die, DW_AT_count, cu);

-      if (attr_to_dynamic_prop (attr, die, cu, &high))

+      if (attr_to_dynamic_prop (attr, die, cu, &high, NULL, 0))

 	{

 	  /* If bounds are constant do the final calculation here.  */

 	  if (low.kind == PROP_CONST && high.kind == PROP_CONST)

@@ -25417,7 +25520,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)

   attr = dwarf2_attr (die, DW_AT_allocated, cu);

   if (attr_form_is_block (attr))

     {

-      if (attr_to_dynamic_prop (attr, die, cu, &prop))

+      if (attr_to_dynamic_prop (attr, die, cu, &prop, NULL, 0))

         add_dyn_prop (DYN_PROP_ALLOCATED, prop, type);

     }

   else if (attr != NULL)

@@ -25431,7 +25534,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)

   attr = dwarf2_attr (die, DW_AT_associated, cu);

   if (attr_form_is_block (attr))

     {

-      if (attr_to_dynamic_prop (attr, die, cu, &prop))

+      if (attr_to_dynamic_prop (attr, die, cu, &prop, NULL, 0))

         add_dyn_prop (DYN_PROP_ASSOCIATED, prop, type);

     }

   else if (attr != NULL)

@@ -25443,7 +25546,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)

   /* Read DW_AT_data_location and set in type.  */

   attr = dwarf2_attr (die, DW_AT_data_location, cu);

-  if (attr_to_dynamic_prop (attr, die, cu, &prop))

+  if (attr_to_dynamic_prop (attr, die, cu, &prop, NULL, 0))

     add_dyn_prop (DYN_PROP_DATA_LOCATION, prop, type);

   if (dwarf2_per_objfile->die_type_hash == NULL)

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c

--- a/gdb/f-typeprint.c

+++ b/gdb/f-typeprint.c

@@ -37,7 +37,7 @@ static void f_type_print_args (struct type *, struct ui_file *);

 #endif

 static void f_type_print_varspec_suffix (struct type *, struct ui_file *, int,

-					 int, int, int);

+					 int, int, int, int);

 void f_type_print_varspec_prefix (struct type *, struct ui_file *,

 				  int, int);

@@ -53,18 +53,6 @@ f_print_type (struct type *type, const char *varstring, struct ui_file *stream,

 {

   enum type_code code;

-  if (type_not_associated (type))

-    {

-      val_print_not_associated (stream);

-      return;

-    }

-

-  if (type_not_allocated (type))

-    {

-      val_print_not_allocated (stream);

-      return;

-    }

-

   f_type_print_base (type, stream, show, level);

   code = TYPE_CODE (type);

   if ((varstring != NULL && *varstring != '\0')

@@ -89,7 +77,7 @@ f_print_type (struct type *type, const char *varstring, struct ui_file *stream,

       demangled_args = (*varstring != '\0'

 			&& varstring[strlen (varstring) - 1] == ')');

-      f_type_print_varspec_suffix (type, stream, show, 0, demangled_args, 0);

+      f_type_print_varspec_suffix (type, stream, show, 0, demangled_args, 0, 0);

    }

 }

@@ -159,7 +147,7 @@ f_type_print_varspec_prefix (struct type *type, struct ui_file *stream,

 static void

 f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,

 			     int show, int passed_a_ptr, int demangled_args,

-			     int arrayprint_recurse_level)

+			     int arrayprint_recurse_level, int print_rank_only)

 {

   int upper_bound, lower_bound;

@@ -183,34 +171,50 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,

 	fprintf_filtered (stream, "(");

       if (type_not_associated (type))

-        val_print_not_associated (stream);

+	print_rank_only = 1;

       else if (type_not_allocated (type))

-        val_print_not_allocated (stream);

+	print_rank_only = 1;

+      else if ((TYPE_ASSOCIATED_PROP (type)

+		&& PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_ASSOCIATED_PROP (type)))

+	      || (TYPE_ALLOCATED_PROP (type)

+		&& PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_ALLOCATED_PROP (type)))

+	      || (TYPE_DATA_LOCATION (type)

+		  && PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_DATA_LOCATION (type))))

+	/* This case exist when we ptype a typename which has the

+	   dynamic properties but cannot be resolved as there is

+	   no object.  */

+	print_rank_only = 1;

+

+      if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY)

+	f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,

+				     0, 0, arrayprint_recurse_level,

+				     print_rank_only);

+

+      if (print_rank_only == 1)

+	fprintf_filtered (stream, ":");

       else

-        {

-          if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY)

-            f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,

-                                        0, 0, arrayprint_recurse_level);

-

-          lower_bound = f77_get_lowerbound (type);

-          if (lower_bound != 1)	/* Not the default.  */

-            fprintf_filtered (stream, "%d:", lower_bound);

-

-          /* Make sure that, if we have an assumed size array, we

-             print out a warning and print the upperbound as '*'.  */

-

-          if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))

-            fprintf_filtered (stream, "*");

-          else

-            {

-              upper_bound = f77_get_upperbound (type);

-              fprintf_filtered (stream, "%d", upper_bound);

-            }

-

-          if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY)

-            f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,

-                                        0, 0, arrayprint_recurse_level);

-        }

+	{

+	  lower_bound = f77_get_lowerbound (type);

+	  if (lower_bound != 1)	/* Not the default.  */

+	    fprintf_filtered (stream, "%d:", lower_bound);

+

+	  /* Make sure that, if we have an assumed size array, we

+	       print out a warning and print the upperbound as '*'.  */

+

+	  if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))

+	    fprintf_filtered (stream, "*");

+	  else

+	    {

+	      upper_bound = f77_get_upperbound (type);

+	      fprintf_filtered (stream, "%d", upper_bound);

+	    }

+	}

+

+      if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY)

+	f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,

+				     0, 0, arrayprint_recurse_level,

+				     print_rank_only);

+

       if (arrayprint_recurse_level == 1)

 	fprintf_filtered (stream, ")");

       else

@@ -221,13 +225,14 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,

     case TYPE_CODE_PTR:

     case TYPE_CODE_REF:

       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0,

-				   arrayprint_recurse_level);

+				   arrayprint_recurse_level, 0);

       fprintf_filtered (stream, ")");

       break;

     case TYPE_CODE_FUNC:

       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,

-				   passed_a_ptr, 0, arrayprint_recurse_level);

+				   passed_a_ptr, 0, arrayprint_recurse_level,

+				   0);

       if (passed_a_ptr)

 	fprintf_filtered (stream, ")");

@@ -388,7 +393,7 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,

 	      fputs_filtered (" :: ", stream);

 	      fputs_filtered (TYPE_FIELD_NAME (type, index), stream);

 	      f_type_print_varspec_suffix (TYPE_FIELD_TYPE (type, index),

-					   stream, show - 1, 0, 0, 0);

+					   stream, show - 1, 0, 0, 0, 0);

 	      fputs_filtered ("\n", stream);

 	    }

 	  fprintfi_filtered (level, stream, "End Type ");

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c

--- a/gdb/gdbtypes.c

+++ b/gdb/gdbtypes.c

@@ -1913,7 +1913,8 @@ is_dynamic_type_internal (struct type *type, int top_level)

   type = check_typedef (type);

   /* We only want to recognize references at the outermost level.  */

-  if (top_level && TYPE_CODE (type) == TYPE_CODE_REF)

+  if (top_level &&

+      (TYPE_CODE (type) == TYPE_CODE_REF || TYPE_CODE (type) == TYPE_CODE_PTR))

     type = check_typedef (TYPE_TARGET_TYPE (type));

   /* Types that have a dynamic TYPE_DATA_LOCATION are considered

@@ -1947,6 +1948,7 @@ is_dynamic_type_internal (struct type *type, int top_level)

       }

     case TYPE_CODE_ARRAY:

+    case TYPE_CODE_STRING:

       {

 	gdb_assert (TYPE_NFIELDS (type) == 1);

@@ -2065,7 +2067,8 @@ resolve_dynamic_array (struct type *type,

   struct dynamic_prop *prop;

   unsigned int bit_stride = 0;

-  gdb_assert (TYPE_CODE (type) == TYPE_CODE_ARRAY);

+  gdb_assert (TYPE_CODE (type) == TYPE_CODE_ARRAY

+	      || TYPE_CODE (type) == TYPE_CODE_STRING);

   type = copy_type (type);

@@ -2090,11 +2093,15 @@ resolve_dynamic_array (struct type *type,

   ary_dim = check_typedef (TYPE_TARGET_TYPE (elt_type));

-  if (ary_dim != NULL && TYPE_CODE (ary_dim) == TYPE_CODE_ARRAY)

+  if (ary_dim != NULL && (TYPE_CODE (ary_dim) == TYPE_CODE_ARRAY

+      || TYPE_CODE (ary_dim) == TYPE_CODE_STRING))

     elt_type = resolve_dynamic_array (ary_dim, addr_stack);

   else

     elt_type = TYPE_TARGET_TYPE (type);

+  if (TYPE_CODE (type) == TYPE_CODE_STRING)

+    return create_string_type (type, elt_type, range_type);

+

   prop = get_dyn_prop (DYN_PROP_BYTE_STRIDE, type);

   if (prop != NULL)

     {

@@ -2249,6 +2256,28 @@ resolve_dynamic_struct (struct type *type,

   return resolved_type;

 }

+/* Worker for pointer types.  */

+

+static struct type *

+resolve_dynamic_pointer (struct type *type,

+			 struct property_addr_info *addr_stack)

+{

+  struct dynamic_prop *prop;

+  CORE_ADDR value;

+

+  type = copy_type (type);

+

+  /* Resolve associated property.  */

+  prop = TYPE_ASSOCIATED_PROP (type);

+  if (prop != NULL && dwarf2_evaluate_property (prop, NULL, addr_stack, &value))

+    {

+      TYPE_DYN_PROP_ADDR (prop) = value;

+      TYPE_DYN_PROP_KIND (prop) = PROP_CONST;

+    }

+

+  return type;

+}

+

 /* Worker for resolved_dynamic_type.  */

 static struct type *

@@ -2297,7 +2326,12 @@ resolve_dynamic_type_internal (struct type *type,

 	    break;

 	  }

+        case TYPE_CODE_PTR:

+ 	  resolved_type = resolve_dynamic_pointer (type, addr_stack);

+ 	  break;

+

 	case TYPE_CODE_ARRAY:

+	case TYPE_CODE_STRING:

 	  resolved_type = resolve_dynamic_array (type, addr_stack);

 	  break;

diff --git a/gdb/testsuite/gdb.cp/vla-cxx.cc b/gdb/testsuite/gdb.cp/vla-cxx.cc

--- a/gdb/testsuite/gdb.cp/vla-cxx.cc

+++ b/gdb/testsuite/gdb.cp/vla-cxx.cc

@@ -15,6 +15,10 @@

    You should have received a copy of the GNU General Public License

    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

+extern "C" {

+#include <stddef.h>

+}

+

 struct container;

 struct element

@@ -40,11 +44,16 @@ int main(int argc, char **argv)

   typedef typeof (vla) &vlareftypedef;

   vlareftypedef vlaref2 (vla);

   container c;

+  typeof (vla) *ptr = NULL;

+

+  // Before pointer assignment

+  ptr = &vla;

   for (int i = 0; i < z; ++i)

     vla[i] = 5 + 2 * i;

   // vlas_filled

   vla[0] = 2 * vla[0];

+

   return vla[2];

 }

diff --git a/gdb/testsuite/gdb.cp/vla-cxx.exp b/gdb/testsuite/gdb.cp/vla-cxx.exp

--- a/gdb/testsuite/gdb.cp/vla-cxx.exp

+++ b/gdb/testsuite/gdb.cp/vla-cxx.exp

@@ -23,6 +23,12 @@ if ![runto_main] {

     return -1

 }

+gdb_breakpoint [gdb_get_line_number "Before pointer assignment"]

+gdb_continue_to_breakpoint "Before pointer assignment"

+gdb_test "ptype ptr" "int \\(\\*\\)\\\[variable length\\\]" "ptype ptr, Before pointer assignment"

+gdb_test "print ptr" "\\(int \\(\\*\\)\\\[variable length\\\]\\) 0x0" "print ptr, Before pointer assignment"

+gdb_test "print *ptr" "Cannot access memory at address 0x0" "print *ptr, Before pointer assignment"

+

 gdb_breakpoint [gdb_get_line_number "vlas_filled"]

 gdb_continue_to_breakpoint "vlas_filled"

@@ -33,3 +39,6 @@ gdb_test "print vlaref" " = \\(int \\(&\\)\\\[3\\\]\\) @$hex: \\{5, 7, 9\\}"

 # bug being tested, it's better not to depend on the exact spelling.

 gdb_test "print vlaref2" " = \\(.*\\) @$hex: \\{5, 7, 9\\}"

 gdb_test "print c" " = \\{e = \\{c = @$hex\\}\\}"

+gdb_test "ptype ptr" "int \\(\\*\\)\\\[3\\\]"

+gdb_test "print ptr" "\\(int \\(\\*\\)\\\[3\\\]\\) $hex"

+gdb_test "print *ptr" " = \\{5, 7, 9\\}"

diff --git a/gdb/testsuite/gdb.fortran/pointers.exp b/gdb/testsuite/gdb.fortran/pointers.exp

new file mode 100644

--- /dev/null

+++ b/gdb/testsuite/gdb.fortran/pointers.exp

@@ -0,0 +1,143 @@

+# Copyright 2016 Free Software Foundation, Inc.

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+standard_testfile "pointers.f90"

+load_lib fortran.exp

+

+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \

+    {debug f90 quiet}] } {

+    return -1

+}

+

+if ![runto_main] {

+    untested "could not run to main"

+    return -1

+}

+

+# Depending on the compiler being used, the type names can be printed differently.

+set logical [fortran_logical4]

+set real [fortran_real4]

+set int [fortran_int4]

+set complex [fortran_complex4]

+

+

+gdb_breakpoint [gdb_get_line_number "Before pointer assignment"]

+gdb_continue_to_breakpoint "Before pointer assignment"

+gdb_test "print logp" "= \\(PTR TO -> \\( $logical \\)\\) 0x0" "print logp, not associated"

+gdb_test "print *logp" "Cannot access memory at address 0x0" "print *logp, not associated"

+gdb_test "print comp" "= \\(PTR TO -> \\( $complex \\)\\) 0x0" "print comp, not associated"

+gdb_test "print *comp" "Cannot access memory at address 0x0" "print *comp, not associated"

+gdb_test "print charp" "= \\(PTR TO -> \\( character\\*1 \\)\\) 0x0" "print charp, not associated"

+gdb_test "print *charp" "Cannot access memory at address 0x0" "print *charp, not associated"

+gdb_test "print charap" "= \\(PTR TO -> \\( character\\*3 \\)\\) 0x0" "print charap, not associated"

+gdb_test "print *charap" "Cannot access memory at address 0x0" "print *charap, not associated"

+gdb_test "print intp" "= \\(PTR TO -> \\( $int \\)\\) 0x0" "print intp, not associated"

+gdb_test "print *intp" "Cannot access memory at address 0x0" "print *intp, not associated"

+set test "print intap, not associated"

+gdb_test_multiple "print intap" $test {

+  -re " = \\(PTR TO -> \\( $int \\(:,:\\)\\)\\) <not associated>\r\n$gdb_prompt $" {

+    pass $test

+  }

+  -re " = <not associated>\r\n$gdb_prompt $" {

+    pass $test

+  }

+}

+gdb_test "print realp" "= \\(PTR TO -> \\( $real \\)\\) 0x0" "print realp, not associated"

+gdb_test "print *realp" "Cannot access memory at address 0x0" "print *realp, not associated"

+gdb_test "print \$my_var = intp" "= \\(PTR TO -> \\( $int \\)\\) 0x0"

+set test "print cyclicp1, not associated"

+gdb_test_multiple "print cyclicp1" $test {

+  -re "= \\( i = -?\\d+, p = 0x0 \\)\r\n$gdb_prompt $" {

+    pass $test

+  }

+  -re "= \\( i = -?\\d+, p = <not associated> \\)\r\n$gdb_prompt $" {

+    pass $test

+  }

+}

+set test "print cyclicp1%p, not associated"

+gdb_test_multiple "print cyclicp1%p" $test {

+  -re "= \\(PTR TO -> \\( Type typewithpointer \\)\\) 0x0\r\n$gdb_prompt $" {

+    pass $test