diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-29 12:37:05 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-29 12:37:05 +0000 |
| commit | 12cb78d1cca1387a092ec0bd49c250340bff4afc (patch) | |
| tree | 1eab97da96906e0a2786d51d9f25f20de02befcf /gcc/tree-object-size.c | |
| parent | 31879e18aea3222fe3e56f2c0319c9f230645ff3 (diff) | |
| download | gcc-12cb78d1cca1387a092ec0bd49c250340bff4afc.tar.gz | |
2012-08-29 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 190745 using svnmerge, notably
C++ conversion.
[gcc/]
2012-08-29 Basile Starynkevitch <basile@starynkevitch.net>
{{merging with trunk, converted to C++}}
* melt-runtime.h (MELT_FLEXIBLE_DIM): Set when C++.
* melt-runtime.c (melt_tempdir_path): Don't use choose_tmpdir from
libiberty.
(meltgc_start_module_by_index): Use address-of & on VEC_index.
(melt_really_initialize): When printing builtin settings, handle
GCC 4.8 as with implicit ENABLE_BUILD_WITH_CXX.
(meltgc_out_edge): Provide additional flag TDF_DETAILS for dump_edge_info.
(melt_val2passflag): Handle PROP_referenced_vars only when defined.
* melt-module.mk: Use GCCMELT_COMPILER instead of GCCMELT_CC.
* melt-build-script.tpl: Transmit GCCMELT_COMPILER on every make
using melt-module.mk and improve the error message.
* melt-build-script.sh: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@190778 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-object-size.c')
| -rw-r--r-- | gcc/tree-object-size.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c index d35922c38ff..fcf9316a395 100644 --- a/gcc/tree-object-size.c +++ b/gcc/tree-object-size.c @@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" #include "tree.h" #include "diagnostic-core.h" -#include "tree-pretty-print.h" #include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-pass.h" @@ -974,14 +973,12 @@ collect_object_sizes_for (struct object_size_info *osi, tree var) break; case GIMPLE_NOP: - { - tree decl = SSA_NAME_VAR (var); - - if (TREE_CODE (decl) != PARM_DECL && DECL_INITIAL (decl)) - expr_object_size (osi, var, DECL_INITIAL (decl)); - else - expr_object_size (osi, var, decl); - } + if (SSA_NAME_VAR (var) + && TREE_CODE (SSA_NAME_VAR (var)) == PARM_DECL) + expr_object_size (osi, var, SSA_NAME_VAR (var)); + else + /* Uninitialized SSA names point nowhere. */ + object_sizes[object_size_type][varno] = unknown[object_size_type]; break; case GIMPLE_PHI: |