3 files changed, 16 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e23dee9..07df399 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-23  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.ada/null_array/foo.adb: Add multi-dimensional array
+	of zero-size elements.
+	* gdb.ada/null_array.exp: Test printing this new array.
+
 2008-05-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/longjmp.exp: Fix GDB_TEST_MULTIPLE missing GDB_PROMPT races.
diff --git a/gdb/testsuite/gdb.ada/null_array.exp b/gdb/testsuite/gdb.ada/null_array.exp
index 36b9a29..7ab9b70 100644
--- a/gdb/testsuite/gdb.ada/null_array.exp
+++ b/gdb/testsuite/gdb.ada/null_array.exp
@@ -37,9 +37,6 @@ gdb_load ${binfile}
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
-# Test printing and type-printing of a tagged type that is not
-# class-wide.
-
 gdb_test "print my_table" \
          "\\(\\)" \
          "print my_table"
@@ -48,3 +45,6 @@ gdb_test "ptype my_table" \
          "type = array \\(10 \\.\\. 1\\) of integer" \
          "ptype my_table"
 
+gdb_test "print my_matrix" \
+         "\\(m => \\((\"\", ){9}\"\"\\)\\)" \
+         "print my_matrix"
diff --git a/gdb/testsuite/gdb.ada/null_array/foo.adb b/gdb/testsuite/gdb.ada/null_array/foo.adb
index 9fed474..07fec5a 100644
--- a/gdb/testsuite/gdb.ada/null_array/foo.adb
+++ b/gdb/testsuite/gdb.ada/null_array/foo.adb
@@ -18,7 +18,14 @@ with Pck; use Pck;
 procedure Foo is
    type Table is array (Integer range <>) of Integer;
 
+   type Matrix is array (1 .. 10, 1 .. 0) of Character;
+   type Wrapper is record
+      M : Matrix;
+   end record;
+
    My_Table : Table (Ident (10) .. Ident (1));
+   My_Matrix : Wrapper := (M => (others => (others => 'a')));
 begin
    Do_Nothing (My_Table'Address);  -- START
+   Do_Nothing (My_Matrix'Address);
 end Foo;