diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 614c14fe22c..7ec7836f10c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-09-19 Aldy Hernandez + + * dwarf2out.c (decl_ultimate_origin): Update comment. + * tree.c (block_ultimate_origin): Same. + 2014-09-19 Ulrich Weigand * config/rs6000/rs6000.c (rs6000_special_adjust_field_align_p): diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 9dd2f880d07..e87ade255ee 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -3676,8 +3676,7 @@ decl_ultimate_origin (const_tree decl) if (!CODE_CONTAINS_STRUCT (TREE_CODE (decl), TS_DECL_COMMON)) return NULL_TREE; - /* output_inline_function sets DECL_ABSTRACT_ORIGIN for all the - nodes in the function to point to themselves; ignore that if + /* DECL_ABSTRACT_ORIGIN can point to itself; ignore that if we're trying to output the abstract instance of this function. */ if (DECL_ABSTRACT (decl) && DECL_ABSTRACT_ORIGIN (decl) == decl) return NULL_TREE; diff --git a/gcc/tree.c b/gcc/tree.c index 87a222fde30..440e2639d32 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -11579,8 +11579,7 @@ block_ultimate_origin (const_tree block) { tree immediate_origin = BLOCK_ABSTRACT_ORIGIN (block); - /* output_inline_function sets BLOCK_ABSTRACT_ORIGIN for all the - nodes in the function to point to themselves; ignore that if + /* BLOCK_ABSTRACT_ORIGIN can point to itself; ignore that if we're trying to output the abstract instance of this function. */ if (BLOCK_ABSTRACT (block) && immediate_origin == block) return NULL_TREE;