From a04739cb173e53b73d3b451d336d63bcb33f1566 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 11 Jun 2012 20:42:20 +0000 Subject: [PATCH] Roland McGrath * dwarf2out.c (const_ok_for_output_1): Detect a TLS UNSPEC using SYMBOL_REF_TLS_MODEL rather than DECL_THREAD_LOCAL_P, in case it's not a VAR_DECL. Also don't limit it to UNSPECs with exactly one operand. From-SVN: r188398 --- gcc/ChangeLog | 7 +++++++ gcc/dwarf2out.c | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8c3a6bf882c..bf972d0614c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-06-11 Roland McGrath + + * dwarf2out.c (const_ok_for_output_1): Detect a TLS UNSPEC using + SYMBOL_REF_TLS_MODEL rather than DECL_THREAD_LOCAL_P, in case it's + not a VAR_DECL. Also don't limit it to UNSPECs with exactly one + operand. + 2012-06-11 Oleg Endo PR target/53511 diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 6e4ab761b75..3fd51fdb3b8 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -10129,12 +10129,12 @@ const_ok_for_output_1 (rtx *rtlp, void *data ATTRIBUTE_UNUSED) we can't express it in the debug info. */ #ifdef ENABLE_CHECKING /* Don't complain about TLS UNSPECs, those are just too hard to - delegitimize. */ - if (XVECLEN (rtl, 0) != 1 + delegitimize. Note this could be a non-decl SYMBOL_REF such as + one in a constant pool entry, so testing SYMBOL_REF_TLS_MODEL + rather than DECL_THREAD_LOCAL_P is not just an optimization. */ + if (XVECLEN (rtl, 0) == 0 || GET_CODE (XVECEXP (rtl, 0, 0)) != SYMBOL_REF - || SYMBOL_REF_DECL (XVECEXP (rtl, 0, 0)) == NULL - || TREE_CODE (SYMBOL_REF_DECL (XVECEXP (rtl, 0, 0))) != VAR_DECL - || !DECL_THREAD_LOCAL_P (SYMBOL_REF_DECL (XVECEXP (rtl, 0, 0)))) + || SYMBOL_REF_TLS_MODEL (XVECEXP (rtl, 0, 0)) == TLS_MODEL_NONE) inform (current_function_decl ? DECL_SOURCE_LOCATION (current_function_decl) : UNKNOWN_LOCATION, -- 2.30.2