diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-30 09:08:59 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-30 09:08:59 +0000 |
| commit | 8e174389f26bfc4e281c74b643e2765171822a12 (patch) | |
| tree | 0395bbbdc3a18687d7a763f132606fdc576f743f /gcc/fortran/trans-decl.c | |
| parent | 4f834b088e9fcd66b5042f03cf7e90ce4938d1db (diff) | |
| download | gcc-8e174389f26bfc4e281c74b643e2765171822a12.tar.gz | |
2012-01-30 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 183694 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@183695 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/trans-decl.c')
| -rw-r--r-- | gcc/fortran/trans-decl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index e8e54c77b79..cb8f613813e 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -326,9 +326,8 @@ gfc_sym_mangled_identifier (gfc_symbol * sym) /* Prevent the mangling of identifiers that have an assigned binding label (mainly those that are bind(c)). */ - if (sym->attr.is_bind_c == 1 - && sym->binding_label[0] != '\0') - return get_identifier(sym->binding_label); + if (sym->attr.is_bind_c == 1 && sym->binding_label) + return get_identifier (sym->binding_label); if (sym->module == NULL) return gfc_sym_identifier (sym); @@ -352,7 +351,7 @@ gfc_sym_mangled_function_id (gfc_symbol * sym) provided, and remove the other checks. Then we could use it for other things if we wished. */ if ((sym->attr.is_bind_c == 1 || sym->attr.is_iso_c == 1) && - sym->binding_label[0] != '\0') + sym->binding_label) /* use the binding label rather than the mangled name */ return get_identifier (sym->binding_label); @@ -3687,7 +3686,7 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) } else if ((!sym->attr.dummy || sym->ts.deferred) && (sym->ts.type == BT_CLASS - && CLASS_DATA (sym)->attr.pointer)) + && CLASS_DATA (sym)->attr.class_pointer)) continue; else if ((!sym->attr.dummy || sym->ts.deferred) && (sym->attr.allocatable @@ -5341,7 +5340,8 @@ gfc_generate_function_code (gfc_namespace * ns) null_pointer_node)); else if (sym->ts.type == BT_CLASS && CLASS_DATA (sym)->attr.allocatable - && sym->attr.dimension == 0 && sym->result == sym) + && CLASS_DATA (sym)->attr.dimension == 0 + && sym->result == sym) { tmp = CLASS_DATA (sym)->backend_decl; tmp = fold_build3_loc (input_location, COMPONENT_REF, |