diff options
author | Jason Merrill <jason@redhat.com> | 2010-11-01 23:29:52 -0400 |
---|---|---|
committer | Jason Merrill <jason@redhat.com> | 2010-11-01 23:32:03 -0400 |
commit | d29b209e37cb85fdf1cb1d8e0ae263cc3c59312b (patch) | |
tree | 0e6b797a6c1a23c50603805706926a5eaa2184f1 /gcc/tree.c | |
parent | 2450a78a38a727e7ec673b132315c8379db3b27d (diff) | |
parent | c0000147b2aef6b69e2c6b6d29a9963910f6da98 (diff) | |
download | gcc-constexpr.tar.gz |
Merge remote branch 'trunk' into constexprconstexpr
Diffstat (limited to 'gcc/tree.c')
-rw-r--r-- | gcc/tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/tree.c b/gcc/tree.c index 4de73ee4d2c..a7460315658 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -1376,8 +1376,8 @@ build_vector_from_val (tree vectype, tree sc) if (sc == error_mark_node) return sc; - gcc_assert (lang_hooks.types_compatible_p (TREE_TYPE (sc), - TREE_TYPE (vectype))); + gcc_assert (useless_type_conversion_p (TREE_TYPE (sc), + TREE_TYPE (vectype))); v = VEC_alloc (constructor_elt, gc, nunits); for (i = 0; i < nunits; ++i) |