Jakub Jelinek [Fri, 6 Apr 2018 17:28:02 +0000 (19:28 +0200)]
re PR rtl-optimization/84872 (ICE in create_preheader, at cfgloopmanip.c:1536)
PR rtl-optimization/84872
* cfgloopmanip.c (create_preheader): Use make_forwarder_block even if
nentry == 1 when CP_FALLTHRU_PREHEADERS and single_entry is
EDGE_CROSSING edge.
* gcc.dg/graphite/pr84872.c: New test.
From-SVN: r259182
Jakub Jelinek [Fri, 6 Apr 2018 17:27:01 +0000 (19:27 +0200)]
re PR c++/85210 (ICE with broken structured binding in template)
PR c++/85210
* pt.c (tsubst_decomp_names): Return error_mark_node and assert
errorcount is set if tsubst doesn't return a VAR_DECL.
* g++.dg/cpp1z/decomp42.C: New test.
From-SVN: r259181
David Malcolm [Fri, 6 Apr 2018 15:46:04 +0000 (15:46 +0000)]
C++: suggest missing headers for implicit use of "std" (PR c++/85021)
We provide fix-it hints for the most common "std" names when an explicit
"std::" prefix is present, however we don't yet provide fix-it hints for
this implicit case:
using namespace std;
void f() { cout << "test"; }
for which we emit:
t.cc: In function 'void f()':
t.cc:2:13: error: 'cout' was not declared in this scope
void f() { cout << "test"; }
^~~~
This patch detects if a "using namespace std;" directive is present
in the current namespace, and if so, offers a suggestion for
unrecognized names that are in our list of common "std" names:
t.cc: In function 'void f()':
t.cc:2:13: error: 'cout' was not declared in this scope
void f() { cout << "test"; }
^~~~
t.cc:2:13: note: 'std::cout' is defined in header '<iostream>'; did you forget to '#include <iostream>'?
+#include <iostream>
using namespace std;
void f() { cout << "test"; }
^~~~
gcc/cp/ChangeLog:
PR c++/85021
* name-lookup.c (using_directives_contain_std_p): New function.
(has_using_namespace_std_directive_p): New function.
(suggest_alternatives_for): Simplify if/else logic using early
returns. If no candidates were found, and there's a
"using namespace std;" directive, call
maybe_suggest_missing_std_header.
(maybe_suggest_missing_header): Split later part of the function
into..
(maybe_suggest_missing_std_header): New.
gcc/testsuite/ChangeLog:
PR c++/85021
* g++.dg/lookup/missing-std-include-7.C: New test.
From-SVN: r259179
Jason Merrill [Fri, 6 Apr 2018 15:12:34 +0000 (11:12 -0400)]
PR c++/85242 - ICE with class definition in template parm.
* cp-tree.h (PROCESSING_REAL_TEMPLATE_DECL_P): False if
processing_template_parmlist.
From-SVN: r259178
Jason Merrill [Fri, 6 Apr 2018 15:12:28 +0000 (11:12 -0400)]
PR c++/85240 - LTO ICE with using of undeduced auto fn.
* cp-gimplify.c (cp_genericize_r): Discard using of undeduced auto.
From-SVN: r259177
Tamar Christina [Fri, 6 Apr 2018 13:16:39 +0000 (13:16 +0000)]
Reverted commit r254862
From-SVN: r259169
Richard Biener [Fri, 6 Apr 2018 11:47:18 +0000 (11:47 +0000)]
re PR tree-optimization/85244 (Bad optimisation with flexible array member (may be related to -ftree-dominator-opts))
2018-04-06 Richard Biener <rguenther@suse.de>
PR middle-end/85244
* tree-dfa.c (get_ref_base_and_extent): Reset seen_variable_array_ref
after seeing a component reference with an adjacent field. Treat
refs to arrays at struct end of external decls similar to
refs to unconstrained commons.
* gcc.dg/torture/pr85244-1.c: New testcase.
* gcc.dg/torture/pr85244-2.c: Likewise.
From-SVN: r259168
Jakub Jelinek [Fri, 6 Apr 2018 11:24:36 +0000 (13:24 +0200)]
re PR sanitizer/85213 (-fsanitize=undefined internal compiler error: in fold_convert_loc, at fold-const.c:2402)
PR sanitizer/85213
* fold-const.c (twoval_comparison_p): Remove SAVE_P argument and don't
look through SAVE_EXPRs with non-side-effects argument. Adjust
recursive calls.
(fold_comparison): Adjust twoval_comparison_p caller, don't handle
save_p here.
* c-c++-common/ubsan/pr85213.c: New test.
From-SVN: r259167
Richard Biener [Fri, 6 Apr 2018 08:30:52 +0000 (08:30 +0000)]
re PR rtl-optimization/85180 (Infinite loop in RTL DSE optimizer)
2018-04-06 Richard Biener <rguenther@suse.de>
PR middle-end/85180
* alias.c (find_base_term): New wrapper around find_base_term
unwinding CSELIB_VAL_PTR changes.
(find_base_term): Do not restore CSELIB_VAL_PTR during the
recursion.
* gcc.dg/pr85180.c: New testcase.
From-SVN: r259166
Andreas Krebbel [Fri, 6 Apr 2018 07:46:30 +0000 (07:46 +0000)]
IBM Z: Fix vcond-shift testcase.
gcc/testsuite/ChangeLog:
2018-04-06 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* gcc.target/s390/vector/vcond-shift.c: Use the proper conditions
to trigger the optimization. Do some cleanup and function
renaming. Add more test functions.
From-SVN: r259165
Andreas Krebbel [Fri, 6 Apr 2018 07:45:42 +0000 (07:45 +0000)]
IBM Z: Use the dedicated NOP instructions for "nop"
We still use lr r0,r0 as a NOP instruction although we have some kind
of dedicated NOP instruction (nopr) which maps to a "branch never".
As a side-effect this fixes testcases scanning for NOPs
e.g. patchable_function_entry-*.
As another side-effect this makes it difficult to distingiush NOPs
generated for hotpatching from NOPs added when using -O0 to attach
location information to it. Hence I had to make sure that the hotpatch
testcases get skipped when compiling without optimization.
gcc/ChangeLog:
2018-04-06 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* config/s390/s390.c (s390_z10_optimize_cmp): Expand dedicated NOP
instructions.
* config/s390/s390.md (UNSPECV_NOP_LR_0, UNSPECV_NOP_LR_1): New
constant definitions.
("nop"): lr 0,0 -> nopr r0
("nop_lr0", "nop_lr1"): New insn definitions.
gcc/testsuite/ChangeLog:
2018-04-06 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* gcc.target/s390/s390.exp: Remove -O0 from list of torture
options.
* gcc.target/s390/hotpatch-1.c: Skip when building without
optimization.
* gcc.target/s390/hotpatch-10.c: Likewise.
* gcc.target/s390/hotpatch-11.c: Likewise.
* gcc.target/s390/hotpatch-12.c: Likewise.
* gcc.target/s390/hotpatch-13.c: Likewise.
* gcc.target/s390/hotpatch-14.c: Likewise.
* gcc.target/s390/hotpatch-15.c: Likewise.
* gcc.target/s390/hotpatch-16.c: Likewise.
* gcc.target/s390/hotpatch-17.c: Likewise.
* gcc.target/s390/hotpatch-18.c: Likewise.
* gcc.target/s390/hotpatch-19.c: Likewise.
* gcc.target/s390/hotpatch-2.c: Likewise.
* gcc.target/s390/hotpatch-3.c: Likewise.
* gcc.target/s390/hotpatch-4.c: Likewise.
* gcc.target/s390/hotpatch-5.c: Likewise.
* gcc.target/s390/hotpatch-6.c: Likewise.
* gcc.target/s390/hotpatch-7.c: Likewise.
* gcc.target/s390/hotpatch-8.c: Likewise.
* gcc.target/s390/hotpatch-9.c: Likewise.
From-SVN: r259164
Andreas Krebbel [Fri, 6 Apr 2018 07:43:53 +0000 (07:43 +0000)]
Wattributes.c testcase: Disable warning check for IBM Z.
On IBM Z we enforce function alignment to 8 bytes. Hence we get an
error instead of a warning when trying to specify smaller alignments.
gcc/testsuite/ChangeLog:
2018-04-06 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* c-c++-common/Wattributes.c: Disable warning for s390* target and
check for an error instead.
* gcc.dg/Wattributes-6.c: Likewise.
From-SVN: r259163
Chung-Ju Wu [Fri, 6 Apr 2018 06:33:44 +0000 (06:33 +0000)]
[NDS32] Refine condition of stack_push and stack_pop patterns.
gcc/
* config/nds32/nds32.md (*stack_push, *stack_pop): Use
NDS32_V3PUSH_AVAILABLE_P macro.
From-SVN: r259162
Monk Chiang [Fri, 6 Apr 2018 05:51:33 +0000 (05:51 +0000)]
[NDS32] Add hard float support.
gcc/
* config.gcc (nds32*-*-*): Add v2j v3f v3s checking.
(nds32*-*-*): Add float and fpu_config into supported_defaults.
* common/config/nds32/nds32-common.c (TARGET_DEFAULT_TARGET_FLAGS):
Include TARGET_DEFAULT_FPU_ISA and TARGET_DEFAULT_FPU_FMA.
* config/nds32/constants.md (unspec_element): Add UNSPEC_COPYSIGN,
UNSPEC_FCPYNSD, UNSPEC_FCPYNSS, UNSPEC_FCPYSD and UNSPEC_FCPYSS.
* config/nds32/constraints.md: New constraints and checking for hard
float configuration.
* config/nds32/iterators.md: New mode iterator and attribute for hard
float configuration.
* config/nds32/nds32-doubleword.md: Use hard float alternatives and
patterns.
* config/nds32/nds32-fpu.md: New file.
* config/nds32/nds32-md-auxiliary.c: New functions and checkings to
deal with hard float code generation.
* config/nds32/nds32-opts.h (nds32_arch_type): Add ARCH_V3F and
ARCH_V3S.
(abi_type, float_reg_number): New enum type.
* config/nds32/nds32-predicates.c: New predicates for hard float.
* config/nds32/nds32-protos.h: Declare functions for hard float.
* config/nds32/nds32.c: Implementation for hard float configuration.
* config/nds32/nds32.h: Definitions for hard float configuration.
* config/nds32/nds32.md: Include hard float machine description and
modify patterns for hard float configuration.
* config/nds32/nds32.opt: New options for hard float configuration.
* config/nds32/predicates.md: New predicates for hard float
configuration.
Co-Authored-By: Chung-Ju Wu <jasonwucj@gmail.com>
From-SVN: r259161
Kuan-Lin Chen [Fri, 6 Apr 2018 03:17:41 +0000 (03:17 +0000)]
[NDS32] Enable relax hint by default.
gcc/
* common/config/nds32/nds32-common.c
(nds32_option_optimization_table): Enable -mreleax-hint by default.
From-SVN: r259160
GCC Administrator [Fri, 6 Apr 2018 00:16:13 +0000 (00:16 +0000)]
Daily bump.
From-SVN: r259159
Jakub Jelinek [Thu, 5 Apr 2018 21:30:47 +0000 (23:30 +0200)]
re PR c++/85209 (ICE with lambda and structured binding)
PR c++/85209
* pt.c (tsubst_decomp_names): Don't fail or ICE if DECL_CHAIN (decl3)
is not prev, if prev == decl.
* g++.dg/cpp1z/decomp39.C: New test.
* g++.dg/cpp1z/decomp40.C: New test.
From-SVN: r259156
Jakub Jelinek [Thu, 5 Apr 2018 21:29:51 +0000 (23:29 +0200)]
re PR c++/85208 (ICE with #pragma weak and structured binding)
PR c++/85208
* decl.c (start_decl): For DECL_DECOMPOSITION_P decls, don't call
maybe_apply_pragma_weak here...
(cp_maybe_mangle_decomp): ... but call it here instead.
* g++.dg/cpp1z/decomp41.C: New test.
From-SVN: r259155
Jason Merrill [Thu, 5 Apr 2018 19:43:39 +0000 (15:43 -0400)]
PR c++/85136 - ICE with designated init in template.
* decl.c (maybe_deduce_size_from_array_init): Handle dependent
designated initializer.
(check_array_designated_initializer): Update ce->index with the
constant value.
From-SVN: r259152
Jakub Jelinek [Thu, 5 Apr 2018 18:35:16 +0000 (20:35 +0200)]
re PR middle-end/85195 (ICE: verify_gimple failed: non-trivial conversion at assignment with -O -fno-tree-ccp --param=sccvn-max-scc-size=10)
PR middle-end/85195
* match.pd (BIT_FIELD_REF CONSTRUCTOR@0 @1 @2): Use view_convert around
CONSTRUCTOR_ELT (ctor, ...)->value.
* gcc.dg/pr85195.c: New test.
From-SVN: r259149
H.J. Lu [Thu, 5 Apr 2018 17:49:39 +0000 (17:49 +0000)]
Use dlsym to check if libdl is needed for plugin
config/plugins.m4 has
if test "$plugins" = "yes"; then
AC_SEARCH_LIBS([dlopen], [dl])
fi
Plugin uses dlsym, but libasan.so only intercepts dlopen, not dlsym:
[hjl@gnu-tools-1 binutils-text]$ nm -D /lib64/libasan.so.4| grep " dl"
0000000000038580 W dlclose
U dl_iterate_phdr
000000000004dc50 W dlopen
U dlsym
U dlvsym
[hjl@gnu-tools-1 binutils-text]$
Testing dlopen for libdl leads to false negative when -fsanitize=address
is used. It results in link failure:
../bfd/.libs/libbfd.a(plugin.o): undefined reference to symbol 'dlsym@@GLIBC_2.16'
dlsym should be used to check if libdl is needed for plugin.
PR gas/22318
* plugins.m4 (AC_PLUGINS): Use dlsym to check if libdl is needed.
From-SVN: r259140
Jason Merrill [Thu, 5 Apr 2018 17:17:11 +0000 (13:17 -0400)]
PR c++/83808 - ICE with VLA initialization.
* typeck2.c (process_init_constructor_array): Don't require a VLA
initializer to have VLA type.
From-SVN: r259138
Paolo Carlini [Thu, 5 Apr 2018 17:08:21 +0000 (17:08 +0000)]
re PR c++/80956 (ICE with abstract class vector)
/cp
2018-04-05 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/80956
* call.c (convert_like_real): Fail gracefully for a broken
std::initializer_list, missing a definition.
* name-lookup.c (do_pushtag): Tweak message, use %< and %>.
/testsuite
2018-04-05 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/80956
* g++.dg/cpp0x/initlist100.C: New.
* g++.dg/cpp0x/initlist101.C: Likewise.
From-SVN: r259137
Paolo Carlini [Thu, 5 Apr 2018 17:05:03 +0000 (17:05 +0000)]
re PR c++/84792 (ICE with broken typedef of a struct)
/cp
2018-04-05 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84792
* decl.c (grokdeclarator): Fix diagnostic about typedef name used
as nested-name-specifier, keep type and TREE_TYPE (decl) in sync.
/testsuite
2018-04-05 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84792
* g++.dg/other/pr84792-1.C: New.
* g++.dg/other/pr84792-2.C: Likewise.
From-SVN: r259136
Jonathan Wakely [Thu, 5 Apr 2018 16:59:13 +0000 (17:59 +0100)]
Add another workaround to std::variant for Clang bug 31852
* include/std/variant (_VARIANT_RELATION_FUNCTION_TEMPLATE): Qualify
__get calls to avoid ADL and avoid ambiguity due to Clang bug.
From-SVN: r259135
Uros Bizjak [Thu, 5 Apr 2018 16:50:49 +0000 (18:50 +0200)]
re PR target/85193 (ICE: SIGSEGV in memory_operand at recog.c:1361 with -O2 -fno-tree-ccp -fno-tree-fre -mno-sse)
PR target/85193
* config/i386/i386.md (define_attr "memory"): Handle rotate1 type.
testsuite/ChangeLog:
PR target/85193
* gcc.target/i386/pr85193.c: New test.
From-SVN: r259134
Jason Merrill [Thu, 5 Apr 2018 16:42:09 +0000 (12:42 -0400)]
PR c++/82152 - ICE with class deduction and inherited ctor.
* pt.c (do_class_deduction): Ignore inherited ctors.
From-SVN: r259133
Jason Merrill [Thu, 5 Apr 2018 16:04:08 +0000 (12:04 -0400)]
PR c++/84665 - ICE with array of empty class.
* decl2.c (cp_check_const_attributes): Use fold_non_dependent_expr.
From-SVN: r259132
Jason Merrill [Thu, 5 Apr 2018 14:48:40 +0000 (10:48 -0400)]
PR c++/85228 - ICE with lambda in enumerator.
* pt.c (bt_instantiate_type_proc): Don't assume
CLASSTYPE_TEMPLATE_INFO is non-null.
From-SVN: r259130
Ville Voutilainen [Thu, 5 Apr 2018 14:43:55 +0000 (17:43 +0300)]
Implement P0969
gcc/cp
Implement P0969
* decl.c (find_decomp_class_base): Check accessibility instead
of declared access, adjust diagnostic.
testsuite/
Implement P0969
* g++.dg/cpp1z/decomp4.C: Adjust.
* g++.dg/cpp1z/decomp38.C: New.
From-SVN: r259129
Ville Voutilainen [Thu, 5 Apr 2018 14:37:18 +0000 (17:37 +0300)]
Implement P0961
gcc/cp
Implement P0961
* decl.c (get_tuple_decomp_init): Check the templatedness
of a member get.
testsuite/
Implement P0961
* g++.dg/cpp1z/decomp10.C: Adjust.
* g++.dg/cpp1z/decomp37.C: New.
From-SVN: r259128
Jason Merrill [Thu, 5 Apr 2018 14:20:53 +0000 (10:20 -0400)]
PR c++/85200 - ICE with constexpr if in generic lambda.
* pt.c (extract_locals_r): Don't record the local specs of variables
declared within the pattern.
From-SVN: r259127
Tom de Vries [Thu, 5 Apr 2018 08:36:37 +0000 (08:36 +0000)]
[nvptx] Fix neutering of bb with only cond jump
2018-04-05 Tom de Vries <tom@codesourcery.com>
PR target/85204
* config/nvptx/nvptx.c (nvptx_single): Fix neutering of bb with only
cond jump.
* testsuite/libgomp.oacc-c-c++-common/broadcast-1.c: New test.
From-SVN: r259125
Alexandre Oliva [Thu, 5 Apr 2018 04:26:36 +0000 (04:26 +0000)]
[PR c++/84979] reject auto in explicit tmpl args for tmpl-fn
With concepts, we accept auto in explicit template arguments, but we
should only accept them for template classes. Passing them to
template functions or variables is not allowed. So, reject it, at
parse time if possible, at specialization time otherwise.
for gcc/cp/ChangeLog
PR c++/84979
* pt.c (check_auto_in_tmpl_args): New.
(tsubst_qualified_id): Use it to reject template args
referencing auto for non-type templates.
* parser.c (cp_parser_template_id): Likewise.
* cp-tree.h (check_auto_in_tmpl_args): Declare.
* typeck2.c (build_functional_cast): Report correct location
for invalid use of auto.
for gcc/testsuite/ChangeLog
PR c++/84979
* g++.dg/concepts/pr84979.C: New.
* g++.dg/concepts/pr84979-2.C: New.
* g++.dg/concepts/pr84979-3.C: New.
From-SVN: r259124
Jason Merrill [Thu, 5 Apr 2018 04:01:15 +0000 (00:01 -0400)]
PR c++/85215 - ICE with copy-init from conversion.
* call.c (merge_conversion_sequences): Fix type of direct binding
sequence.
From-SVN: r259123
Shiva Chen [Thu, 5 Apr 2018 03:35:28 +0000 (03:35 +0000)]
[NDS32] Fine-tune memory address type.
gcc/
* config/nds32/constraints.md (U33): Fine-tune checking condition.
* config/nds32/nds32-md-auxiliary.c (nds32_mem_format): Ditto.
* config/nds32/nds32.h (nds32_16bit_address_type): Add
ADDRESS_POST_MODIFY_LO_REG_IMM3U.
Co-Authored-By: Kito Cheng <kito.cheng@gmail.com>
From-SVN: r259122
Shiva Chen [Thu, 5 Apr 2018 03:25:20 +0000 (03:25 +0000)]
[NDS32] Add constraint for lwi45.fe instruction.
gcc/
* config/nds32/constraints.md (Ufe): New memory constraint.
* config/nds32/nds32-md-auxiliary.c (nds32_mem_format,
nds32_output_16bit_load): Consider r8 register for lwi45.fe format.
* config/nds32/nds32.c (nds32_print_operand): Output lwi45.fe
operands.
* config/nds32/nds32.h (nds32_16bit_address_type): Add ADDRESS_R8_IMM7U.
* config/nds32/nds32.md (*mov<mode>): Adjust pattern.
Co-Authored-By: Kito Cheng <kito.cheng@gmail.com>
From-SVN: r259121
Chung-Ju Wu [Thu, 5 Apr 2018 03:10:42 +0000 (03:10 +0000)]
[NDS32] Generate alu-shift instructions only for -Os.
gcc/
* config/nds32/nds32.md: Use optimize_size in the condition for
alu-shift instructions.
From-SVN: r259120
Chung-Ju Wu [Thu, 5 Apr 2018 03:05:45 +0000 (03:05 +0000)]
[NDS32] Add divsi4 and udivsi4 patterns.
gcc/
* config/nds32/nds32.md (divsi4, udivsi4): New patterns.
From-SVN: r259119
Chung-Ju Wu [Thu, 5 Apr 2018 02:58:19 +0000 (02:58 +0000)]
[NDS32] Refine negsi2 pattern.
gcc/
* config/nds32/nds32.md (negsi2): Refine pattern.
From-SVN: r259118
Kito Cheng [Thu, 5 Apr 2018 02:51:45 +0000 (02:51 +0000)]
[NDS32] Refine bit-wise operation and shift patterns.
gcc/
* config/nds32/iterators.md (shift_rotate): New code iterator.
(shift): New code attribute.
* config/nds32/nds32-md-auxiliary.c (nds32_expand_constant): New.
* config/nds32/nds32-protos.h (nds32_expand_constant): Declare.
* config/nds32/nds32.c (nds32_print_operand): Deal with more cases.
* config/nds32/nds32.md (addsi3, *add_srli): Refine implementation for
bit-wise operations.
(andsi3, *andsi3): Ditto.
(iorsi3, *iorsi3, *or_slli, *or_srli): Ditto.
(xorsi3, *xorsi3, *xor_slli, *xor_srli): Ditto.
(<shift>si3, *ashlsi3, *ashrsi3, *lshrsi3, *rotrsi3): Ditto.
* config/nds32/predicates.md (nds32_rimm5u_operand, nds32_and_operand,
nds32_ior_operand, nds32_xor_operand): New predicates.
Co-Authored-By: Chung-Ju Wu <jasonwucj@gmail.com>
From-SVN: r259117
Chung-Ju Wu [Thu, 5 Apr 2018 02:23:19 +0000 (02:23 +0000)]
[NDS32] The add and sub pattens should only accept si mode.
gcc/
* config/nds32/nds32.md (add<mode>3, sub<mode>3): Rename to ...
(addsi3, subsi3): ... this.
From-SVN: r259116
Chung-Ju Wu [Thu, 5 Apr 2018 02:05:06 +0000 (02:05 +0000)]
[NDS32] Fine-tune predicator for alu-shift patterns.
gcc/
* config/nds32/nds32.md (*sub_srli, *and_slli): Fine-tune predicator.
From-SVN: r259115
Chung-Ju Wu [Thu, 5 Apr 2018 01:49:13 +0000 (01:49 +0000)]
[NDS32] Adjust asm patterns indention.
gcc/
* config/nds32/nds32.md: Adjust indention.
From-SVN: r259114
Kito Cheng [Thu, 5 Apr 2018 01:43:05 +0000 (01:43 +0000)]
[NDS32] Add new instruction attribute: feature.
gcc/
* config/nds32/nds32.md (feature): New attribute.
From-SVN: r259113
Chung-Ju Wu [Thu, 5 Apr 2018 01:35:00 +0000 (01:35 +0000)]
[NDS32] Add subtype attribute for instructions.
gcc/
* config/nds32/nds32.md (subtype): New attribute.
From-SVN: r259112
GCC Administrator [Thu, 5 Apr 2018 00:16:23 +0000 (00:16 +0000)]
Daily bump.
From-SVN: r259111
Jason Merrill [Thu, 5 Apr 2018 00:09:10 +0000 (20:09 -0400)]
PR c++/84938 - ICE with division by ~-1.
* call.c (set_up_extended_ref_temp): Call cp_fully_fold.
From-SVN: r259108
Jason Merrill [Thu, 5 Apr 2018 00:09:05 +0000 (20:09 -0400)]
PR c++/84936 - ICE with unexpanded pack in mem-initializer.
* parser.c (cp_parser_mem_initializer_list): Call
check_for_bare_parameter_packs.
From-SVN: r259107
Jason Merrill [Wed, 4 Apr 2018 19:59:20 +0000 (15:59 -0400)]
re PR c++/84221 (spurious -Wunused warning on a variable of a template type declared unused)
PR c++/84221
* g++.dg/warn/Wunused-var-32.C: Test explicit specialization.
From-SVN: r259106
Paolo Carlini [Wed, 4 Apr 2018 19:57:33 +0000 (19:57 +0000)]
re PR c++/80026 ([pending testcase installation] passing unresolved function pointer to variadic function template yields "too many arguments" error)
2018-04-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/80026
* g++.dg/cpp0x/variadic174.C: New.
From-SVN: r259105
Jakub Jelinek [Wed, 4 Apr 2018 19:55:56 +0000 (21:55 +0200)]
re PR inline-asm/85172 (internal compiler error: unexpected expression '<statement>' of kind asm_expr)
PR inline-asm/85172
* constexpr.c (cxx_eval_builtin_function_call): For calls to
builtin_valid_in_constant_expr_p functions, don't call
cxx_eval_constant_expression if argument is not
potential_constant_expression.
* g++.dg/ext/builtin13.C: New test.
* g++.dg/ext/atomic-4.C: New test.
From-SVN: r259104
Jakub Jelinek [Wed, 4 Apr 2018 19:34:18 +0000 (21:34 +0200)]
re PR c++/85146 (ICE with __direct_bases for declared but not defined struct)
PR c++/85146
* cp-tree.h (calculate_bases, calculate_direct_bases): Add complain
argument.
* semantics.c (calculate_bases): Add complain argument. Use
complete_type_or_maybe_complain instead of just complete_type and
return an empty vector if it fails. Move make_tree_vector () call
after early return. Formatting fixes.
(calculate_direct_bases): Likewise. Call release_tree_vector at the
end.
(dfs_calculate_bases_post, calculate_bases_helper): Formatting fixes.
* pt.c (tsubst_pack_expansion): Adjust calculate_bases and
calculate_direct_bases callers, formatting fixes.
* g++.dg/ext/bases2.C: Expect extra error diagnostics.
* g++.dg/ext/bases3.C: New test.
From-SVN: r259101
Jason Merrill [Wed, 4 Apr 2018 19:19:34 +0000 (15:19 -0400)]
PR c++/85006 - -fconcepts ICE with A<auto...> return type
* pt.c (tsubst_pack_expansion): Allow unsubstituted auto pack.
From-SVN: r259100
Jason Merrill [Wed, 4 Apr 2018 19:10:38 +0000 (15:10 -0400)]
PR c++/85200 - ICE with constexpr if in generic lambda.
* tree.c (cp_walk_subtrees): Walk into DECL_EXPR in templates.
From-SVN: r259099
Jason Merrill [Wed, 4 Apr 2018 19:10:32 +0000 (15:10 -0400)]
PR c++/84221 - bogus -Wunused with attribute and template.
* decl2.c (is_late_template_attribute): Handle unused and used
normally on non-TYPE_DECL.
From-SVN: r259098
Thomas Preud'homme [Wed, 4 Apr 2018 17:31:46 +0000 (17:31 +0000)]
[ARM] Fix PR85203: cmse_nonsecure_caller returns wrong result
__builtin_cmse_nonsecure_caller implementation returns true in almost
all cases due to 2 separate bugs:
* gen_addsi is used instead of gen_andsi to retrieve the lsb
* the lsb boolean value is not negated but the specification says
the intrinsic should return true for a nonsecure caller and a
nonsecure caller is characterized with LR's lsb being 0
This was not caught due to (1) lack of runtime test and (2) the existing
RTL scan not taking into account that '.' matches newline in Tcl regular
expressions.
This commit fixes the implementation issues and improves testing of
cmse_nonsecure_caller by (1) adding a runtime test for the secure caller
case and (2) looking for an SET insn of an AND expression in the right
function. This leaves the nonsecure caller case only partly tested
since the exact value being AND and the negation are not covered by the
scan and the existing test infrastructure does not allow 2 separate
compilation and link to be performed. It is enough though to catch the
current incorrect behavior.
The commit also reorganize the scan directives in cmse-1.c to more
easily identify what function they are intended to test in the file.
2018-04-04 Thomas Preud'homme <thomas.preudhomme@arm.com>
gcc/
PR target/85203
* config/arm/arm-builtins.c (arm_expand_builtin): Change
expansion to perform a bitwise AND of the argument followed by a
boolean negation of the result.
gcc/testsuite/
PR target/85203
* gcc.target/arm/cmse/cmse-1.c: Tighten cmse_nonsecure_caller RTL scan
to match a single insn of the baz function. Move scan directives at
the end of the file below the functions they are trying to test for
better readability.
* gcc.target/arm/cmse/cmse-16.c: New testcase.
From-SVN: r259097
Jakub Jelinek [Wed, 4 Apr 2018 17:18:14 +0000 (19:18 +0200)]
re PR other/85161 (Test case failures in libbacktrace on powerpc64 BE starting with r253456)
PR other/85161
* elf.c (elf_zlib_fetch): Fix up predefined macro names in test for
big endian, only use 32-bit loads if endianity macros are predefined
and indicate big or little endian.
From-SVN: r259096
Jason Merrill [Wed, 4 Apr 2018 16:42:55 +0000 (12:42 -0400)]
PR c++/85135 - ICE with omitted template arguments.
* decl.c (grokdeclarator): Catch deduced class type in trailing
return type.
From-SVN: r259092
Jason Merrill [Wed, 4 Apr 2018 16:42:50 +0000 (12:42 -0400)]
PR c++/85133 - ICE with missing concept initializer.
* decl.c (cp_finish_decl): If a concept initializer is missing, use
true.
From-SVN: r259091
Jason Merrill [Wed, 4 Apr 2018 16:42:44 +0000 (12:42 -0400)]
PR c++/85118 - wrong error with generic lambda and std::bind.
* call.c (add_template_conv_candidate): Disable if there are any
call operators.
From-SVN: r259090
Jason Merrill [Wed, 4 Apr 2018 16:42:39 +0000 (12:42 -0400)]
PR c++/85141 - ICE with compound assignment and static member fn.
* typeck.c (cp_build_modify_expr): Call decay_conversion for RHS of
compound assignment.
From-SVN: r259089
Jason Merrill [Wed, 4 Apr 2018 16:42:33 +0000 (12:42 -0400)]
PR c++/85148 - ICE with 'this' in array NSDMI.
* tree.c (replace_placeholders_r): Use handled_component_p.
From-SVN: r259088
Ville Voutilainen [Wed, 4 Apr 2018 16:05:11 +0000 (19:05 +0300)]
re PR c++/65923 (False positive for warning about literal operator suffix and using)
PR c++/65923
gcc/cp
PR c++/65923
* decl.c (grokfndecl): Handle standard UDL diagnostics here..
* parser.c (cp_parser_unqualified_id): ..not here.
testsuite/
PR c++/65923
* g++.dg/diagnostic/pr65923.C: New.
From-SVN: r259087
Peter Bergner [Wed, 4 Apr 2018 15:35:03 +0000 (10:35 -0500)]
re PR rtl-optimization/84878 (ICE: Segmentation fault (in add_cross_iteration_register_deps))
gcc/
PR rtl-optimization/84878
* ddg.c (add_cross_iteration_register_deps): Use DF_REF_BB to determine
the basic block. Assert the use reference is not artificial and that
it has an associated insn.
gcc/testsuite/
PR rtl-optimization/84878
* gcc.target/powerpc/pr84878.c: New test.
From-SVN: r259085
Michael Matz [Wed, 4 Apr 2018 14:49:06 +0000 (14:49 +0000)]
Fix -Wstringop-overflow regression
we shouldn't claim string overflows for character arrays at
end of structures; the code that tries to avoid these
accidentally passed the address of the accessed member to
array_at_struct_end_p(), but that one wants the component_ref
or array_ref itself. Needs updating of one testcase that
incorrectly expected warning to occur in this situation.
From-SVN: r259083
Jakub Jelinek [Wed, 4 Apr 2018 14:14:08 +0000 (16:14 +0200)]
re PR testsuite/85189 (g++.dg/inherit/override-attribs.C FAILs on 32-bit x86)
PR testsuite/85189
* g++.dg/inherit/override-attribs.C: Use dg-message instead of dg-error
for the diagnostics of overridden functions. Adjust for new wording.
From-SVN: r259082
Richard Biener [Wed, 4 Apr 2018 14:11:39 +0000 (14:11 +0000)]
re PR debug/85176 (ICE in force_decl_die, at dwarf2out.c:25910)
2018-04-04 Richard Biener <rguenther@suse.de>
PR lto/85176
* dwarf2out.c (dwarf2out_register_external_die): Peel namespaces
from contexts for DINFO_LEVEL_TERSE and below.
* g++.dg/lto/pr85176_0.C: New testcase.
From-SVN: r259080
Kito Cheng [Wed, 4 Apr 2018 12:38:04 +0000 (12:38 +0000)]
[NDS32] Restrict mov pattern that has at least one register operand.
gcc/
* config/nds32/nds32-doubleword.md (move_<mode>): Require
resiter_operand condition.
* config/nds32/nds32.md (*move<mode>): Ditto.
From-SVN: r259077
Richard Biener [Wed, 4 Apr 2018 12:16:21 +0000 (12:16 +0000)]
re PR tree-optimization/85191 (gcc.dg/vect/slp-perm-9.c FAILs)
2018-04-04 Richard Biener <rguenther@suse.de>
PR testsuite/85191
* lib/target-supports.exp (check_effective_target_vect_perm_short):
Fix typo.
From-SVN: r259075
Martin Liska [Wed, 4 Apr 2018 10:40:57 +0000 (12:40 +0200)]
Disable anchors and msdata for ASAN test-case (PR sanirizer/85174).
2018-04-04 Martin Liska <mliska@suse.cz>
PR sanitizer/85174
* c-c++-common/asan/pointer-compare-1.c: Disable section anchors
and msdata as a workaround for powerpc.
From-SVN: r259074
Kito Cheng [Wed, 4 Apr 2018 09:32:31 +0000 (09:32 +0000)]
[NDS32] Implement movmisalignsi and movmisaligndi pattern.
gcc/
* config/nds32/nds32.md (movmisalign<mode>): New pattern.
Co-Authored-By: Monk Chiang <sh.chiang04@gmail.com>
From-SVN: r259073
Thomas Koenig [Wed, 4 Apr 2018 09:26:13 +0000 (09:26 +0000)]
re PR libfortran/85166 ([nvptx, libgfortran] Libgomp fortran tests using stop in offloaded fns fail to compile)
2018-04-04 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/85166
* runtime/minimal.c (stop_numeric): Add new function in order to
implement numeric stop on minimal targets.
From-SVN: r259072
Chung-Ju Wu [Wed, 4 Apr 2018 09:19:39 +0000 (09:19 +0000)]
[NDS32] Merge movqi and movhi patterns.
gcc/
* config/nds32/nds32.md (movqi, movhi): Merge into mov<mode>.
From-SVN: r259071
Chung-Ju Wu [Wed, 4 Apr 2018 08:48:56 +0000 (08:48 +0000)]
[NDS32] Refine movcc, cmov, cstore and cbranch patterns.
gcc/
* config/nds32/nds32-md-auxiliary.c (nds32_inverse_cond_code,
nds32_cond_code_str, output_cond_branch,
output_cond_branch_compare_zero, nds32_expand_cbranch,
nds32_expand_cstore, nds32_expand_movcc,
nds32_output_cbranchsi4_equality_zero,
nds32_output_cbranchsi4_equality_reg,
nds32_output_cbranchsi4_equality_reg_or_const_int,
nds32_output_cbranchsi4_greater_less_zero: New functions.
* config/nds32/nds32-protos.h (nds32_expand_cbranch,
nds32_expand_cstore, nds32_expand_movcc,
nds32_output_cbranchsi4_equality_zero,
nds32_output_cbranchsi4_equality_reg,
nds32_output_cbranchsi4_equality_reg_or_const_int,
nds32_output_cbranchsi4_greater_less_zero): Declare.
* config/nds32/predicates.md (nds32_movecc_comparison_operator,
nds32_rimm11s_operand): New predicates.
* config/nds32/nds32.h (nds32_expand_result_type): New enum type.
* config/nds32/nds32.md: Rewrite all the branch and conditional move
patterns.
Co-Authored-By: Kito Cheng <kito.cheng@gmail.com>
From-SVN: r259070
Kito Cheng [Wed, 4 Apr 2018 08:25:36 +0000 (08:25 +0000)]
[NDS32] Refine instruction type attribute.
gcc/
* config/nds32/nds32-doubleword.md: Refine all the instruction type.
* config/nds32/nds32.md: Ditto.
* config/nds32/pipelines.md: Ditto.
From-SVN: r259069
Richard Biener [Wed, 4 Apr 2018 07:52:20 +0000 (07:52 +0000)]
re PR tree-optimization/85168 (ICE in tree-ssa-coalesce.c: SSA corruption: Unable to coalesce ssa_names which are marked as MUST COALESCE when -O2 is used)
2018-04-04 Richard Biener <rguenther@suse.de>
PR tree-optimization/85168
* tree-ssa-sccvn.c (vn_reference_maybe_forwprop_address): Avoid
propagating abnormals.
* gcc.dg/torture/pr85168.c: New testcase.
From-SVN: r259068
Alexandre Oliva [Wed, 4 Apr 2018 03:40:29 +0000 (03:40 +0000)]
[PR c++/84943] mark function as used when taking its address
fn[0]() ICEd because we would fold the INDIRECT_REF used for the
array indexing while building the address for the call, after not
finding the decl hiding there at first. But the decl would be exposed
by the folding, and then lower layers would complain we had the decl,
after all, but it wasn't one of the artificial or special functions
that could be called without being marked as used.
This patch arranges for a FUNCTION_DECL to be marked as used when
taking its address, just like we already did when taking the address
of a static function to call it as a member function (i.e. using the
obj.fn() notation). However, we shouldn't mark functions as used when
just performing overload resolution, lest we might instantiate
templates we shouldn't, as in g++.dg/overload/template1.C, so we
adjust mark_used to return early when testing conversions.
for gcc/cp/ChangeLog
PR c++/84943
* typeck.c (cp_build_addr_expr_1): Mark FUNCTION_DECL as
used.
* decl2.c (mark_used): Return without effects if tf_conv.
for gcc/testsuite/ChangeLog
PR c++/84943
* g++.dg/pr84943.C: New.
* g++.dg/pr84943-2.C: New.
From-SVN: r259067
Chung-Ju Wu [Wed, 4 Apr 2018 01:35:01 +0000 (01:35 +0000)]
[NDS32] Change enabled attribute to yes/no instead of 1/0.
gcc/
* config/nds32/nds32.md (enabled): Use yes/no for this attribute.
From-SVN: r259066
Chung-Ju Wu [Wed, 4 Apr 2018 00:56:16 +0000 (00:56 +0000)]
[NDS32] Refine implementation of sibcall patterns.
gcc/
* config/nds32/nds32-md-auxiliary.c (nds32_long_call_p): New function.
* config/nds32/nds32-protos.h (nds32_long_call_p): Declare.
* config/nds32/nds32.c (nds32_function_ok_for_sibcall): New function.
(TARGET_FUNCTION_OK_FOR_SIBCALL): Define.
* config/nds32/nds32.md (sibcall_internal): New.
(sibcall_register): Remove.
(sibcall_immediate): Remove.
(sibcall_value_internal): New.
(sibcall_value_register): Remove.
(sibcall_value_immediate): Remove.
* config/nds32/predicates.md (nds32_general_register_operand): New.
(nds32_call_address_operand): New.
Co-Authored-By: Kito Cheng <kito.cheng@gmail.com>
From-SVN: r259065
GCC Administrator [Wed, 4 Apr 2018 00:16:19 +0000 (00:16 +0000)]
Daily bump.
From-SVN: r259064
Jonathan Wakely [Tue, 3 Apr 2018 23:03:07 +0000 (00:03 +0100)]
PR libstdc++/85183 fix std::variant move-assignment
PR libstdc++/85183
* include/std/variant (_Move_assign_base::operator=): Fix incorrect
value categories.
* testsuite/20_util/variant/85183.cc: New.
From-SVN: r259059
Jakub Jelinek [Tue, 3 Apr 2018 21:45:52 +0000 (23:45 +0200)]
re PR rtl-optimization/85167 (shrink-wrap.c:333:15: runtime error with UBSAN)
PR rtl-optimization/85167
* shrink-wrap.c (move_insn_for_shrink_wrap): Don't set bb_uses and
bb_defs if *split_p, instead preinitialize it to NULL.
* gcc.dg/pr85167.c: New test.
From-SVN: r259058
Jakub Jelinek [Tue, 3 Apr 2018 21:42:51 +0000 (23:42 +0200)]
re PR tree-optimization/85156 (ICE with -O1 -g: gimplification failed)
PR tree-optimization/85156
* builtins.c (fold_builtin_expect): Use save_expr on arg1 to avoid
evaluating the argument multiple times.
* c-c++-common/pr85156.c: New test.
* gcc.c-torture/execute/pr85156.c: New test.
From-SVN: r259057
Jason Merrill [Tue, 3 Apr 2018 19:13:42 +0000 (15:13 -0400)]
PR c++/85092 - C++17 ICE with unused list constructor.
* call.c (conv_binds_ref_to_prvalue): Also count ck_identity
from a TARGET_EXPR.
From-SVN: r259052
Jason Merrill [Tue, 3 Apr 2018 19:13:36 +0000 (15:13 -0400)]
PR c++/85113 - ICE with constexpr and __builtin_constant_p.
* constexpr.c (cxx_eval_builtin_function_call): Only defer
__builtin_constant_p if ctx->quiet.
From-SVN: r259051
Bill Schmidt [Tue, 3 Apr 2018 19:06:28 +0000 (19:06 +0000)]
emmintrin.h (_mm_cvtpd_epi32): Use __vector rather than vector.
[gcc]
2018-04-03 Bill Schmidt <wschmidt@linux.ibm.com>
* config/rs6000/emmintrin.h (_mm_cvtpd_epi32): Use __vector rather
than vector.
(_mm_cvtpd_ps): Likewise.
(_mm_cvttpd_epi32): Likewise.
* config/rs6000/mmintrin.h (_mm_unpacklo_pi8): Likewise.
* config/rs6000/xmmintrin.h: For strict-ANSI C++ or C11, undefine
vector, pixel, and bool following altivec.h include.
[gcc/testsuite]
2018-04-03 Bill Schmidt <wschmidt@linux.ibm.com>
* gcc.target/powerpc/powerpc.exp: Add .C suffix for main loop.
* gcc.target/powerpc/undef-bool-1.C: New file.
* gcc.target/powerpc/undef-bool-2.c: New file.
From-SVN: r259050
Paolo Carlini [Tue, 3 Apr 2018 17:53:05 +0000 (17:53 +0000)]
re PR c++/84768 (ICE with failed class template argument deduction because of invalid template parameter)
/cp
2018-04-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84768
* pt.c (rewrite_template_parm): If the first argument is
error_mark_node return it immediately.
(build_deduction_guide): Check the return value of the
latter for error_mark_node.
(do_class_deduction): Check the return value of the latter.
/testsuite
2018-04-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84768
* g++.dg/cpp1z/class-deduction52.C: New.
From-SVN: r259049
Jason Merrill [Tue, 3 Apr 2018 17:41:17 +0000 (13:41 -0400)]
* semantics.c (finish_if_stmt_cond): Use instantiation_dependent_expression_p.
From-SVN: r259044
Jason Merrill [Tue, 3 Apr 2018 17:41:12 +0000 (13:41 -0400)]
PR c++/85149 - generic lambda and constexpr if.
* pt.c (build_extra_args, add_extra_args): Split from
tsubst_pack_expansion.
(tsubst_expr) [IF_STMT]: Use them.
* cp-tree.h (IF_STMT_EXTRA_ARGS): New.
From-SVN: r259043
Jason Merrill [Tue, 3 Apr 2018 17:41:06 +0000 (13:41 -0400)]
Fix noexcept merging with system headers.
* typeck.c (merge_types): Limit matching attribute shortcut to
the default case.
From-SVN: r259042
Martin Sebor [Tue, 3 Apr 2018 17:35:14 +0000 (17:35 +0000)]
extend.texi (Common Function Attributes): Clarify.
gcc/ChangeLog:
* doc/extend.texi (Common Function Attributes): Clarify.
(const attribute): Likewise.
(pure attribute): Likewise.
From-SVN: r259041
Jakub Jelinek [Tue, 3 Apr 2018 16:22:05 +0000 (18:22 +0200)]
re PR c++/85147 (ICE with invalid variadic template-template parameter)
PR c++/85147
* pt.c (fixed_parameter_pack_p_1): Punt if parm is error_mark_node.
* g++.dg/cpp0x/pr85147.C: New test.
From-SVN: r259040
Jakub Jelinek [Tue, 3 Apr 2018 16:21:02 +0000 (18:21 +0200)]
re PR c++/85140 (ICE with invalid use of alignas)
PR c++/85140
* name-lookup.c (handle_namespace_attrs): Return early if attributes
is error_mark_node.
* g++.dg/cpp0x/gen-attrs-64.C: New test.
From-SVN: r259039
Jakub Jelinek [Tue, 3 Apr 2018 16:20:02 +0000 (18:20 +0200)]
re PR c++/85134 (ICE with invalid constexpr in 'shared' OpenMP clause)
PR c++/85134
* decl.c (cp_finish_decl): If ensure_literal_type_for_constexpr_object
fails, after clearing DECL_DECLARED_CONSTEXPR_P don't return early,
instead for static data members clear init and set DECL_EXTERNAL.
* g++.dg/gomp/pr85134.C: New test.
* g++.dg/cpp0x/constexpr-ice19.C: Expect one further error.
From-SVN: r259038
Jakub Jelinek [Tue, 3 Apr 2018 16:06:19 +0000 (18:06 +0200)]
re PR target/85169 (wrong code with vector member insert)
PR target/85169
* config/i386/i386.c (ix86_expand_vector_set): Use
HOST_WIDE_INT_1U << elt instead of 1 << elt. Formatting fix.
* gcc.c-torture/execute/pr85169.c: New test.
* gcc.target/i386/avx512f-pr85169.c: New test.
* gcc.target/i386/avx512bw-pr85169.c: New test.
From-SVN: r259037
Segher Boessenkool [Tue, 3 Apr 2018 15:38:43 +0000 (17:38 +0200)]
rs6000: Fix pr69946.c testcase (PR85126)
After middle-end changes combine now gets fed different input, from
which it makes different (but just as efficient) code. So remove the
test for particular asm output.
gcc/testsuite/
PR target/85126
* gcc.target/powerpc/pr69946: Adjust comment. Remove
scan-assembler-times clause.
From-SVN: r259036
Uros Bizjak [Tue, 3 Apr 2018 14:59:21 +0000 (16:59 +0200)]
i386.c (emit_i387_cw_initialization): Always use logic instructions when changing rounding bits to preserve precision...
* config/i386/i386.c (emit_i387_cw_initialization): Always use logic
instructions when changing rounding bits to preserve precision bits
in the x87 control word.
From-SVN: r259034
Christophe Lyon [Tue, 3 Apr 2018 14:01:52 +0000 (14:01 +0000)]
[ARM,testsuite] Force hard-float on armv8_2-fp16-move-1.c
2018-04-03 Christophe Lyon <christophe.lyon@linaro.org>
* gcc.target/arm/armv8_2-fp16-move-1.c: Move -mfloat-abi=hard to
dg-additional-options.
From-SVN: r259031
Martin Liska [Tue, 3 Apr 2018 13:43:22 +0000 (15:43 +0200)]
Remove UBSAN in dwarf2out.c (PR tree-optimization/82491).
2018-04-03 Martin Liska <mliska@suse.cz>
PR tree-optimization/82491
* rtl.h (strip_offset_and_add): Replace += suboffset with
poly_uint64 () + suboffset.
From-SVN: r259030