Merge in trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@206327 138bc75d-0d04-0410-961f-82ee72b054a4

diff --cc gcc/Makefile.in
Simple merge

diff --cc gcc/ada/gcc-interface/decl.c
Simple merge

diff --cc gcc/alias.c
Simple merge

diff --cc gcc/builtins.c
Simple merge

diff --cc gcc/c-family/c-ada-spec.c
Simple merge

diff --cc gcc/c-family/c-common.c
Simple merge

diff --cc gcc/c-family/c-format.c
Simple merge

diff --cc gcc/c-family/c-lex.c
Simple merge

diff --cc gcc/c-family/c-pretty-print.c
Simple merge

diff --cc gcc/c-family/cilk.c
Simple merge

diff --cc gcc/c/c-decl.c
Simple merge

diff --cc gcc/c/c-parser.c
index af425b2,f73df08..25fa701
--- 1/gcc/c/c-parser.c
--- 2/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@@ -13379,11 -13560,16 +13560,16 @@@ c_parser_cilk_clause_vectorlength (c_pa
    tree expr = c_parser_expr_no_commas (parser, NULL).value;
    expr = c_fully_fold (expr, false, NULL);
  
-   if (!TREE_TYPE (expr)
-       || !TREE_CONSTANT (expr)
-       || !INTEGRAL_TYPE_P (TREE_TYPE (expr)))
-     error_at (loc, "vectorlength must be an integer constant");
+   /* If expr is an error_mark_node then the above function would have
+      emitted an error.  No reason to do it twice.  */
+   if (expr == error_mark_node)
+     ;
+   else if (!TREE_TYPE (expr)
+          || !TREE_CONSTANT (expr)
+          || !INTEGRAL_TYPE_P (TREE_TYPE (expr)))
+   
+     error_at (loc, "vectorlength must be an integer constant");  
 -  else if (exact_log2 (TREE_INT_CST_LOW (expr)) == -1)
 +  else if (wi::exact_log2 (expr) == -1)
      error_at (loc, "vectorlength must be a power of 2");
    else
      {

diff --cc gcc/c/c-typeck.c
Simple merge

diff --cc gcc/cfgloop.c
Simple merge

diff --cc gcc/cfgloop.h
Simple merge

diff --cc gcc/cgraph.c
Simple merge

diff --cc gcc/combine.c
Simple merge

diff --cc gcc/config/aarch64/aarch64.c
Simple merge

diff --cc gcc/config/arc/arc.c
Simple merge

diff --cc gcc/config/arm/arm.c
Simple merge

diff --cc gcc/config/avr/avr.c
Simple merge

diff --cc gcc/config/bfin/bfin.c
Simple merge

diff --cc gcc/config/darwin.c
Simple merge

diff --cc gcc/config/i386/i386.c
Simple merge

diff --cc gcc/config/msp430/msp430.c
Simple merge

diff --cc gcc/config/nds32/nds32.c
Simple merge

diff --cc gcc/config/rs6000/predicates.md
Simple merge

diff --cc gcc/config/rs6000/rs6000-c.c
Simple merge

diff --cc gcc/config/rs6000/rs6000.c
Simple merge

diff --cc gcc/config/rs6000/rs6000.h
Simple merge

diff --cc gcc/config/rs6000/rs6000.md
Simple merge

diff --cc gcc/config/sol2-c.c
Simple merge

diff --cc gcc/config/sparc/sparc.c
Simple merge

diff --cc gcc/config/vax/vax.c
Simple merge

diff --cc gcc/coretypes.h
Simple merge

diff --cc gcc/cp/call.c
Simple merge

diff --cc gcc/cp/class.c
Simple merge

diff --cc gcc/cp/cvt.c
Simple merge

diff --cc gcc/cp/decl.c
Simple merge

diff --cc gcc/cp/init.c
Simple merge

diff --cc gcc/cp/mangle.c
Simple merge

diff --cc gcc/cp/tree.c
Simple merge

diff --cc gcc/cp/typeck2.c
Simple merge

diff --cc gcc/cse.c
Simple merge

diff --cc gcc/cselib.c
Simple merge

diff --cc gcc/dbxout.c
Simple merge

diff --cc gcc/defaults.h
Simple merge

diff --cc gcc/dfp.c
Simple merge

diff --cc gcc/dfp.h
Simple merge

diff --cc gcc/doc/generic.texi
Simple merge

diff --cc gcc/doc/rtl.texi
Simple merge

diff --cc gcc/doc/tm.texi
Simple merge

diff --cc gcc/doc/tm.texi.in
Simple merge

diff --cc gcc/dojump.c
Simple merge

diff --cc gcc/double-int.h
Simple merge

diff --cc gcc/dwarf2out.c
Simple merge

diff --cc gcc/dwarf2out.h
Simple merge

diff --cc gcc/emit-rtl.c
Simple merge

diff --cc gcc/explow.c
Simple merge

diff --cc gcc/expmed.c
Simple merge

diff --cc gcc/expr.c
Simple merge

diff --cc gcc/final.c
Simple merge

diff --cc gcc/fixed-value.c
Simple merge

diff --cc gcc/fold-const.c
Simple merge

diff --cc gcc/fold-const.h
Simple merge

diff --cc gcc/fortran/target-memory.c
Simple merge

diff --cc gcc/fortran/trans-array.c
Simple merge

diff --cc gcc/fortran/trans-const.c
Simple merge

diff --cc gcc/fortran/trans-decl.c
Simple merge

diff --cc gcc/fortran/trans-expr.c
Simple merge

diff --cc gcc/fortran/trans-intrinsic.c
Simple merge

diff --cc gcc/fortran/trans-types.c
Simple merge

diff --cc gcc/gencheck.c
Simple merge

diff --cc gcc/genemit.c
Simple merge

diff --cc gcc/gengenrtl.c
Simple merge

diff --cc gcc/gengtype-lex.l
Simple merge

diff --cc gcc/gengtype-parse.c
Simple merge

diff --cc gcc/gengtype-state.c
Simple merge

diff --cc gcc/gengtype.c
Simple merge

diff --cc gcc/genpreds.c
Simple merge

diff --cc gcc/genrecog.c
Simple merge

diff --cc gcc/gensupport.c
Simple merge

diff --cc gcc/gimple-fold.c
Simple merge

diff --cc gcc/gimple-pretty-print.c
Simple merge

diff --cc gcc/gimple-ssa-strength-reduction.c
Simple merge

diff --cc gcc/gimple.c
Simple merge

diff --cc gcc/go/go-gcc.cc
Simple merge

diff --cc gcc/godump.c
Simple merge

diff --cc gcc/graphite-clast-to-gimple.c
Simple merge

diff --cc gcc/graphite-sese-to-poly.c
Simple merge

diff --cc gcc/hooks.c
Simple merge

diff --cc gcc/hooks.h
Simple merge

diff --cc gcc/internal-fn.c
Simple merge

diff --cc gcc/ipa-devirt.c
Simple merge

diff --cc gcc/ipa-prop.c
Simple merge

diff --cc gcc/java/boehm.c
Simple merge

diff --cc gcc/java/expr.c
Simple merge

diff --cc gcc/java/jcf-parse.c
Simple merge

diff --cc gcc/loop-doloop.c
Simple merge

diff --cc gcc/loop-iv.c
Simple merge

diff --cc gcc/loop-unroll.c
Simple merge

diff --cc gcc/lto-streamer-in.c
Simple merge

diff --cc gcc/lto-streamer-out.c
Simple merge

diff --cc gcc/lto/lto-lang.c
Simple merge

diff --cc gcc/lto/lto.c
Simple merge

diff --cc gcc/mkconfig.sh
Simple merge

diff --cc gcc/objc/objc-act.c
Simple merge

diff --cc gcc/omp-low.c
Simple merge

diff --cc gcc/optabs.c
Simple merge

diff --cc gcc/postreload.c
Simple merge

diff --cc gcc/predict.c
Simple merge

diff --cc gcc/pretty-print.h
Simple merge

diff --cc gcc/print-rtl.c
Simple merge

diff --cc gcc/print-tree.c
Simple merge

diff --cc gcc/read-rtl.c
Simple merge

diff --cc gcc/real.c
Simple merge

diff --cc gcc/real.h
Simple merge

diff --cc gcc/recog.c
Simple merge

diff --cc gcc/rtl.c
Simple merge

diff --cc gcc/rtl.def
Simple merge

diff --cc gcc/rtl.h
Simple merge

diff --cc gcc/rtlanal.c
Simple merge

diff --cc gcc/sched-vis.c
Simple merge

diff --cc gcc/sel-sched-ir.c
Simple merge

diff --cc gcc/simplify-rtx.c
Simple merge

diff --cc gcc/stmt.c
Simple merge

diff --cc gcc/stor-layout.c
Simple merge

diff --cc gcc/stor-layout.h
Simple merge

diff --cc gcc/system.h
Simple merge

diff --cc gcc/target.def
Simple merge

diff --cc gcc/target.h
Simple merge

diff --cc gcc/targhooks.c
Simple merge

diff --cc gcc/targhooks.h
Simple merge

diff --cc gcc/tree-affine.c
Simple merge

diff --cc gcc/tree-affine.h
Simple merge

diff --cc gcc/tree-call-cdce.c
Simple merge

diff --cc gcc/tree-cfg.c
Simple merge

diff --cc gcc/tree-chrec.c
Simple merge

diff --cc gcc/tree-core.h
Simple merge

diff --cc gcc/tree-data-ref.c
Simple merge

diff --cc gcc/tree-dfa.c
Simple merge

diff --cc gcc/tree-dfa.h
Simple merge

diff --cc gcc/tree-dump.c
Simple merge

diff --cc gcc/tree-inline.c
Simple merge

diff --cc gcc/tree-object-size.c
Simple merge

diff --cc gcc/tree-predcom.c
Simple merge

diff --cc gcc/tree-pretty-print.c
Simple merge

diff --cc gcc/tree-scalar-evolution.c
Simple merge

diff --cc gcc/tree-ssa-address.c
Simple merge

diff --cc gcc/tree-ssa-alias.c
Simple merge

diff --cc gcc/tree-ssa-ccp.c
Simple merge

diff --cc gcc/tree-ssa-forwprop.c
Simple merge

diff --cc gcc/tree-ssa-loop-im.c
Simple merge

diff --cc gcc/tree-ssa-loop-ivcanon.c
Simple merge

diff --cc gcc/tree-ssa-loop-ivopts.c
Simple merge

diff --cc gcc/tree-ssa-loop-niter.c
Simple merge

diff --cc gcc/tree-ssa-loop-niter.h
Simple merge

diff --cc gcc/tree-ssa-loop.h
Simple merge

diff --cc gcc/tree-ssa-math-opts.c
Simple merge

diff --cc gcc/tree-ssa-phiopt.c
Simple merge

diff --cc gcc/tree-ssa-pre.c
Simple merge

diff --cc gcc/tree-ssa-reassoc.c
Simple merge

diff --cc gcc/tree-ssa-sccvn.c
Simple merge

diff --cc gcc/tree-ssa-structalias.c
Simple merge

diff --cc gcc/tree-ssa-uninit.c
Simple merge

diff --cc gcc/tree-ssa.c
Simple merge

diff --cc gcc/tree-ssanames.c
Simple merge

diff --cc gcc/tree-ssanames.h
Simple merge

diff --cc gcc/tree-streamer-in.c
Simple merge

diff --cc gcc/tree-streamer-out.c
Simple merge

diff --cc gcc/tree-switch-conversion.c
Simple merge

diff --cc gcc/tree-vect-data-refs.c
Simple merge

diff --cc gcc/tree-vect-generic.c
Simple merge

diff --cc gcc/tree-vect-loop-manip.c
Simple merge

diff --cc gcc/tree-vect-loop.c
Simple merge

diff --cc gcc/tree-vect-patterns.c
Simple merge

diff --cc gcc/tree-vect-stmts.c
Simple merge

diff --cc gcc/tree-vrp.c
Simple merge

diff --cc gcc/tree.c
Simple merge

diff --cc gcc/tree.def
Simple merge

diff --cc gcc/tree.h
Simple merge

diff --cc gcc/value-prof.c
Simple merge

diff --cc gcc/var-tracking.c
Simple merge

diff --cc gcc/varasm.c
Simple merge