Skip to content

R
riscv-gcc-1
Commit 88272c01 by Jakub Jelinek Committed by Jakub Jelinek
Options

dwarf2out.c (tree_add_const_value_attribute): For INTEGER_CST that fits into uhwi or shwi... 

	* dwarf2out.c (tree_add_const_value_attribute): For INTEGER_CST
	that fits into uhwi or shwi, add DW_AT_const_value regardless
	of early_dwarf without going through RTL, using add_AT_unsigned
	or add_AT_int.

	* g++.dg/debug/dwarf2/template-params-13.C: New test.
	* g++.dg/debug/dwarf2/template-params-5.C: Adjust regexps so that
	it doesn't match newlines.
	* g++.dg/debug/dwarf2/template-params-3.C: Likewise.
	* g++.dg/debug/dwarf2/template-func-params-3.C: Likewise.
	* g++.dg/debug/dwarf2/lang-cpp98.C: Likewise.
	* g++.dg/debug/dwarf2/template-func-params-2.C: Likewise.
	* g++.dg/debug/dwarf2/template-func-params-1.C: Likewise.
	* g++.dg/debug/dwarf2/template-func-params-5.C: Likewise.
	* g++.dg/debug/dwarf2/template-params-1.C: Likewise.
	* g++.dg/debug/dwarf2/template-params-2.C: Likewise.
	* g++.dg/debug/dwarf2/lang-cpp14.C: Likewise.
	* g++.dg/debug/dwarf2/lang-cpp11.C: Likewise.

From-SVN: r253004
parent dcc34072
Showing with 57 additions and 13 deletions
gcc/ChangeLog
2017-09-20 Jakub Jelinek <jakub@redhat.com>
* dwarf2out.c (tree_add_const_value_attribute): For INTEGER_CST
that fits into uhwi or shwi, add DW_AT_const_value regardless
of early_dwarf without going through RTL, using add_AT_unsigned
or add_AT_int.
* dwarf2out.c (DEBUG_LTO_DWO_INFO_SECTION): Reorder defines.
(DEBUG_LTO_ABBREV_SECTION): Likewise.
(DEBUG_LTO_MACINFO_SECTION): Likewise.
......
gcc/dwarf2out.c
......@@ -19446,6 +19446,19 @@ tree_add_const_value_attribute (dw_die_ref die, tree t)
init = t;
gcc_assert (!DECL_P (init));
if (TREE_CODE (init) == INTEGER_CST)
{
if (tree_fits_uhwi_p (init))
{
add_AT_unsigned (die, DW_AT_const_value, tree_to_uhwi (init));
return true;
}
if (tree_fits_shwi_p (init))
{
add_AT_int (die, DW_AT_const_value, tree_to_shwi (init));
return true;
}
}
if (! early_dwarf)
{
rtl = rtl_for_decl_init (init, type);
......
gcc/testsuite/ChangeLog
2017-09-20 Jakub Jelinek <jakub@redhat.com>
* g++.dg/debug/dwarf2/template-params-13.C: New test.
* g++.dg/debug/dwarf2/template-params-5.C: Adjust regexps so that
it doesn't match newlines.
* g++.dg/debug/dwarf2/template-params-3.C: Likewise.
* g++.dg/debug/dwarf2/template-func-params-3.C: Likewise.
* g++.dg/debug/dwarf2/lang-cpp98.C: Likewise.
* g++.dg/debug/dwarf2/template-func-params-2.C: Likewise.
* g++.dg/debug/dwarf2/template-func-params-1.C: Likewise.
* g++.dg/debug/dwarf2/template-func-params-5.C: Likewise.
* g++.dg/debug/dwarf2/template-params-1.C: Likewise.
* g++.dg/debug/dwarf2/template-params-2.C: Likewise.
* g++.dg/debug/dwarf2/lang-cpp14.C: Likewise.
* g++.dg/debug/dwarf2/lang-cpp11.C: Likewise.
2017-09-20 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/64954
......
gcc/testsuite/g++.dg/debug/dwarf2/lang-cpp11.C
// { dg-do compile }
// { dg-options "-O -std=c++11 -gdwarf-5 -dA" }
// DW_LANG_C_plus_plus_11 = 0x001a
// { dg-final { scan-assembler "0x1a.*DW_AT_language" } } */
// { dg-final { scan-assembler "0x1a\[^\n\r]* DW_AT_language" } } */
int version;
gcc/testsuite/g++.dg/debug/dwarf2/lang-cpp14.C
// { dg-do compile }
// { dg-options "-O -std=c++14 -gdwarf-5 -dA" }
// DW_LANG_C_plus_plus_14 = 0x0021
// { dg-final { scan-assembler "0x21.*DW_AT_language" } } */
// { dg-final { scan-assembler "0x21\[^\n\r]* DW_AT_language" } } */
int version;
gcc/testsuite/g++.dg/debug/dwarf2/lang-cpp98.C
// { dg-do compile }
// { dg-options "-O -std=c++98 -gdwarf-2 -dA" }
// DW_LANG_C_plus_plus = 0x0004
// { dg-final { scan-assembler "0x4.*DW_AT_language" } } */
// { dg-final { scan-assembler "0x4\[^\n\r]* DW_AT_language" } } */
int version;
gcc/testsuite/g++.dg/debug/dwarf2/template-func-params-1.C
......@@ -3,7 +3,7 @@
// { dg-options "-gdwarf-2 -dA" }
// { dg-do compile }
// { dg-final { scan-assembler "DW_TAG_template_type_param" } }
// { dg-final { scan-assembler "U.*DW_AT_name" } }
// { dg-final { scan-assembler "U\[^\n\r]* DW_AT_name" } }
template <class U>
U
......
gcc/testsuite/g++.dg/debug/dwarf2/template-func-params-2.C
......@@ -3,8 +3,8 @@
// { dg-options "-gdwarf-2 -dA" }
// { dg-do compile }
// { dg-final { scan-assembler "DW_TAG_template_value_param" } }
// { dg-final { scan-assembler "i.*DW_AT_name" } }
// { dg-final { scan-assembler "3.*DW_AT_const_value" } }
// { dg-final { scan-assembler "i\[^\n\r]* DW_AT_name" } }
// { dg-final { scan-assembler "3\[^\n\r]* DW_AT_const_value" } }
template <int i>
......
gcc/testsuite/g++.dg/debug/dwarf2/template-func-params-3.C
......@@ -2,7 +2,7 @@
// Origin PR debug/30161
// { dg-options "-gdwarf-2 -dA -gno-strict-dwarf -fno-merge-debug-strings" }
// { dg-final { scan-assembler "DW_TAG_template_value_param" } }
// { dg-final { scan-assembler "f.*DW_AT_name" } }
// { dg-final { scan-assembler "f\[^\n\r]* DW_AT_name" } }
// { dg-final { scan-assembler "DW_AT_location\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*DW_OP_addr\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*_Z4blehv\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*DW_OP_stack_value" } } */
typedef void (*func_ptr)();
......
gcc/testsuite/g++.dg/debug/dwarf2/template-func-params-5.C
......@@ -2,7 +2,7 @@
// Origin PR debug/30161
// { dg-options "-gdwarf-2 -dA" }
// { dg-final { scan-assembler "DW_TAG_template_type_param" } }
// { dg-final { scan-assembler "T.*DW_AT_name" } }
// { dg-final { scan-assembler "T\[^\n\r]* DW_AT_name" } }
template <class T>
struct vector
......
gcc/testsuite/g++.dg/debug/dwarf2/template-params-1.C
......@@ -3,7 +3,7 @@
// { dg-options "-gdwarf-2 -dA" }
// { dg-do compile }
// { dg-final { scan-assembler "DW_TAG_template_type_param" } }
// { dg-final { scan-assembler "U.*DW_AT_name" } }
// { dg-final { scan-assembler "U\[^\n\r]* DW_AT_name" } }
template <class U>
class A
......
gcc/testsuite/g++.dg/debug/dwarf2/template-params-13.C 0 → 100644
// { dg-options "-gdwarf-2 -dA" }
// { dg-do compile }
// { dg-final { scan-assembler "DW_TAG_template_value_param" } }
// { dg-final { scan-assembler "N\[^\n\r]* DW_AT_name" } }
// { dg-final { scan-assembler "9\[^\n\r]* DW_AT_const_value" } }
template <int N> class C {};
template <typename T> struct E {};
E<struct A> f;
struct A { C<9> g; };
gcc/testsuite/g++.dg/debug/dwarf2/template-params-2.C
......@@ -3,8 +3,8 @@
// { dg-options "-gdwarf-2 -dA" }
// { dg-do compile }
// { dg-final { scan-assembler "DW_TAG_template_value_param" } }
// { dg-final { scan-assembler "i.*DW_AT_name" } }
// { dg-final { scan-assembler "3.*DW_AT_const_value" } }
// { dg-final { scan-assembler "i\[^\n\r]* DW_AT_name" } }
// { dg-final { scan-assembler "3\[^\n\r]* DW_AT_const_value" } }
template <int i>
struct A
......
gcc/testsuite/g++.dg/debug/dwarf2/template-params-3.C
......@@ -2,7 +2,7 @@
// Origin PR debug/30161
// { dg-options "-gdwarf-2 -dA -gno-strict-dwarf -fno-merge-debug-strings" }
// { dg-final { scan-assembler "DW_TAG_template_value_param" } }
// { dg-final { scan-assembler "f.*DW_AT_name" } }
// { dg-final { scan-assembler "f\[^\n\r]* DW_AT_name" } }
// { dg-final { scan-assembler "DW_AT_location\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*DW_OP_addr\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*_Z4blehv\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*DW_OP_stack_value" } } */
typedef void (*func_ptr) ();
......
gcc/testsuite/g++.dg/debug/dwarf2/template-params-5.C
......@@ -2,7 +2,7 @@
// Origin PR debug/30161
// { dg-options "-gdwarf-2 -dA" }
// { dg-final { scan-assembler "DW_TAG_template_type_param" } }
// { dg-final { scan-assembler "T.*DW_AT_name" } }
// { dg-final { scan-assembler "T\[^\n\r]* DW_AT_name" } }
template <class T>
struct vector
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment