diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2008-05-24 09:49:55 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2008-05-24 09:49:55 +0000 |
| commit | 58272d795a53f6e0c389f581630a50305086d05b (patch) | |
| tree | 5e79a1709061ee94b029dcc12e00a648f68b6a1f /gcc/ada | |
| parent | 7c88f67af2a876e108a5fa1abd64e87e9e3019bc (diff) | |
| download | gcc-58272d795a53f6e0c389f581630a50305086d05b.zip gcc-58272d795a53f6e0c389f581630a50305086d05b.tar.gz gcc-58272d795a53f6e0c389f581630a50305086d05b.tar.bz2 | |
trans.c (gnat_to_gnu): Do not set source location info on NOP_EXPRs.
* trans.c (gnat_to_gnu): Do not set source location info on NOP_EXPRs.
(Sloc_to_locus): Do not overwrite known GCC locations when translating
GNAT standard locations.
From-SVN: r135847
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/trans.c | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 35f9a08..f7305e8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2008-05-24 Eric Botcazou <ebotcazou@adacore.com> + + * trans.c (gnat_to_gnu): Do not set source location info on NOP_EXPRs. + (Sloc_to_locus): Do not overwrite known GCC locations when translating + GNAT standard locations. + 2008-05-23 Eric Botcazou <ebotcazou@adacore.com> * gigi.h (mark_visited): Declare. diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c index 4bc772d..5f579e7 100644 --- a/gcc/ada/trans.c +++ b/gcc/ada/trans.c @@ -4880,7 +4880,10 @@ gnat_to_gnu (Node_Id gnat_node) the location information of their last use. Note that we may have no result if we tried to build a CALL_EXPR node to a procedure with no side-effects and optimization is enabled. */ - if (gnu_result && EXPR_P (gnu_result) && !REFERENCE_CLASS_P (gnu_result)) + if (gnu_result + && EXPR_P (gnu_result) + && TREE_CODE (gnu_result) != NOP_EXPR + && !REFERENCE_CLASS_P (gnu_result)) set_expr_location_from_node (gnu_result, gnat_node); /* If we're supposed to return something of void_type, it means we have @@ -6853,7 +6856,8 @@ Sloc_to_locus (Source_Ptr Sloc, location_t *locus) if (Sloc <= Standard_Location) { - *locus = BUILTINS_LOCATION; + if (*locus == UNKNOWN_LOCATION) + *locus = BUILTINS_LOCATION; return false; } else |