forked from Imagelibrary/binutils-gdb
PR c++/18141, c++/18417.
gdb/ChangeLog: * cp-support.c (cp_lookup_rtti_type): Handle the case of NAME being a typedef. gdb/testsuite/ChangeLog: * gdb.cp/iostream.cc: New file. * gdb.cp/iostream.exp: New file.
This commit is contained in:
@@ -1,3 +1,9 @@
|
||||
2015-05-26 Doug Evans <dje@google.com>
|
||||
|
||||
PR c++/18141, c++/18417.
|
||||
* cp-support.c (cp_lookup_rtti_type): Handle the case of NAME being
|
||||
a typedef.
|
||||
|
||||
2015-05-26 Doug Evans <dje@google.com>
|
||||
|
||||
* NEWS: Add entries for command renamings.
|
||||
|
||||
@@ -1453,7 +1453,9 @@ cp_lookup_rtti_type (const char *name, struct block *block)
|
||||
struct symbol * rtti_sym;
|
||||
struct type * rtti_type;
|
||||
|
||||
rtti_sym = lookup_symbol (name, block, STRUCT_DOMAIN, NULL);
|
||||
/* Use VAR_DOMAIN here as NAME may be a typedef. PR 18141, 18417.
|
||||
Classes "live" in both STRUCT_DOMAIN and VAR_DOMAIN. */
|
||||
rtti_sym = lookup_symbol (name, block, VAR_DOMAIN, NULL);
|
||||
|
||||
if (rtti_sym == NULL)
|
||||
{
|
||||
@@ -1467,7 +1469,7 @@ cp_lookup_rtti_type (const char *name, struct block *block)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
rtti_type = SYMBOL_TYPE (rtti_sym);
|
||||
rtti_type = check_typedef (SYMBOL_TYPE (rtti_sym));
|
||||
|
||||
switch (TYPE_CODE (rtti_type))
|
||||
{
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
2015-05-26 Doug Evans <dje@google.com>
|
||||
|
||||
* gdb.cp/iostream.cc: New file.
|
||||
* gdb.cp/iostream.exp: New file.
|
||||
|
||||
2015-05-26 Doug Evans <dje@google.com>
|
||||
|
||||
* gdb.dwarf2/dw2-op-call.exp: Update.
|
||||
|
||||
27
gdb/testsuite/gdb.cp/iostream.cc
Normal file
27
gdb/testsuite/gdb.cp/iostream.cc
Normal file
@@ -0,0 +1,27 @@
|
||||
/* Code to go along with tests in rtti.exp.
|
||||
|
||||
Copyright 2015 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GDB.
|
||||
|
||||
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/>. */
|
||||
|
||||
#include <iostream>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
std::cerr << "cerr\n";
|
||||
return 0;
|
||||
}
|
||||
44
gdb/testsuite/gdb.cp/iostream.exp
Normal file
44
gdb/testsuite/gdb.cp/iostream.exp
Normal file
@@ -0,0 +1,44 @@
|
||||
# Copyright 2015 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/>.
|
||||
|
||||
# This file is part of the gdb testsuite.
|
||||
# It tests various aspects of iostream that have caused problems for gdb.
|
||||
|
||||
if { [skip_cplus_tests] } { continue }
|
||||
|
||||
standard_testfile .cc
|
||||
|
||||
if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
|
||||
return -1
|
||||
}
|
||||
|
||||
if ![runto_main] {
|
||||
perror "couldn't run to breakpoint"
|
||||
continue
|
||||
}
|
||||
|
||||
# PR 18417
|
||||
# std::iostream is problematic because the minimal symbol for its vtable is
|
||||
# "_ZTVSo" which demangles as "vtable for std::ostream" and std::iostream
|
||||
# a typedef.
|
||||
set test "p std::cerr"
|
||||
gdb_test_multiple $test $test {
|
||||
-re "warning: RTTI symbol for class '.*' has bad type.*$gdb_prompt $" {
|
||||
fail $test
|
||||
}
|
||||
-re ".*$gdb_prompt $" {
|
||||
pass $test
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user