Fix long lines

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159386 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-14  Jonathan Wakely  <jwakely.gcc@gmail.com>

* call.c (build_new_method_call): Change warning text.
* typeck2.c (build_functional_cast): Change error text.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159385 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/cp/
2010-05-14  Shujing Zhao  <pearly.zhao@oracle.com>

        PR c++/30566
        * name-lookup.c (pushdecl_maybe_friend): Avoid the warnings about
        shadowing the outer parameter or variables by the declaration of
        nested function in nested structure or class. Warn the shadowing by
        the declaration of nested lambda expression.

gcc/testsuite/
2010-05-14  Shujing Zhao  <pearly.zhao@oracle.com>

        PR c++/30566
        * testsuite/g++.dg/warn/Wshadow-4.C: Adjust.
        * testsuite/g++.dg/warn/Wshadow-5.C: New test.
        * testsuite/g++.dg/warn/Wshadow-6.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159383 138bc75d-0d04-0410-961f-82ee72b054a4

PR target/44075
* config/rs6000/rs6000.c (struct machine_function): Reorder
fields for better packing.  Add lr_save_state.
(rs6000_ra_ever_killed): Return lr_save_state if set.
(rs6000_emit_eh_reg_restore): Set lr_save_state.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159382 138bc75d-0d04-0410-961f-82ee72b054a4

Daily bump.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159381 138bc75d-0d04-0410-961f-82ee72b054a4

* typeck.c (cp_build_array_ref): Factor out from...
(build_array_ref): ...here.  Drop complain parm.
(build_new_op): Adjust.
* class.c (build_vtbl_ref_1): Adjust.
* decl2.c (grok_array_decl): Adjust.
* cp-tree.h: Adjust prototypes.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159377 138bc75d-0d04-0410-961f-82ee72b054a4

* decl.c (cp_finish_decl): Do not worry about used attribute.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159372 138bc75d-0d04-0410-961f-82ee72b054a4

* varpool.c (decide_is_variable_needed): Drop code checking
TREE_SYMBOL_REFERENCED.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159371 138bc75d-0d04-0410-961f-82ee72b054a4

* final.c (output_addr_const): Do not call mark_decl_referenced.
* cgraphunit.c (process_function_and_variable_attributes): Use
mark_needed_node dirrectly.
(assemble_thunk): Do not call mark_decl_referenced.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159370 138bc75d-0d04-0410-961f-82ee72b054a4

* targhooks.c (default_mode_dependent_address_p): Cast 'addr' to rtx.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159369 138bc75d-0d04-0410-961f-82ee72b054a4

* ira-conflicts.c (print_allocno_conflicts): New function broken out
from...
(print_conflicts): Call print_allocno_conflicts.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159368 138bc75d-0d04-0410-961f-82ee72b054a4

PR debug/44104
* dwarf2out.c (modified_type_die): Don't dereference mod_type_die
if it is NULL.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159367 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/fortran/:
2010-05-13  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/35779
        * intrinsic.c (gfc_init_expr): Renamed to gfc_init_expr_flag.
        Updated all usages.
        * expr.c (init_flag): Removed; use gfc_init_expr_flag everywhere.
        * array.c (match_array_list): Pass on gfc_init_expr_flag when matching
        iterators.

gcc/testsuite/:
2010-05-13  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/35779
        * gfortran.dg/initialization_25.f90: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159366 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-13  Kai Tietz  <kai.tietz@onevision.com>

        * config.gcc (i[34567]86-*-mingw* | x86_64-*-mingw*): Choose
        t-mingw-w64 or t-mingw-w32 for multilib configuration.
        * config/i386/t-mingw-w32: New.
        * config/i386/t-mingw-w64 (MULTILIB_OSDIRNAMES): Change lib64 to lib.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159364 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-13  Martin Jambor  <mjambor@suse.cz>

* gimple.c (gimple_fold_obj_type_ref): Removed (a replacement moved to
gimple-fold.c).
* gimple-fold.c (get_base_binfo_for_type): New function.
(gimple_get_relevant_ref_binfo): Likewise.
(gimple_fold_obj_type_ref_known_binfo): Likewise.
(gimple_fold_obj_type_ref): Likewise.
(fold_gimple_call): Simplify condition for folding virtual calls
and call gimple_fold_obj_type_ref.
* gimple.h (gimple_get_relevant_ref_binfo): Declare.
(gimple_fold_obj_type_ref_known_binfo): Likewise.

* testsuite/g++.dg/otr-fold-1.C: New test.
* testsuite/g++.dg/otr-fold-2.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159362 138bc75d-0d04-0410-961f-82ee72b054a4

PR fortran/44036
* openmp.c (resolve_omp_clauses): Allow procedure pointers in clause
variable lists.
* trans-openmp.c (gfc_omp_privatize_by_reference): Don't privatize
by reference dummy procedures or non-dummy procedure pointers.
(gfc_omp_predetermined_sharing): Return
OMP_CLAUSE_DEFAULT_FIRSTPRIVATE for dummy procedures.

* gfortran.dg/gomp/pr44036-1.f90: New test.
* gfortran.dg/gomp/pr44036-2.f90: New test.
* gfortran.dg/gomp/pr44036-3.f90: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159361 138bc75d-0d04-0410-961f-82ee72b054a4

* config/rs6000/rs6000-protos.h
(rs6000_mode_dependent_address_ptr): Change argument to const_rtx.
* config/rs6000/rs6000.c (rs6000_mode_dependent_address)
(rs6000_debug_mode_dependent_address)
(rs6000_mode_dependent_address_ptr): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159359 138bc75d-0d04-0410-961f-82ee72b054a4

Fix formatting nits

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159358 138bc75d-0d04-0410-961f-82ee72b054a4

PR debug/43983
* var-tracking.c (track_expr_p): Allow tracking of variables optimized
by SRA.
* Makefile.in (dwarf2out.o): Depend on $(TREE_FLOW_H).
* tree-sra.c (create_access_replacement): Call unshare_expr before
passing expr to SET_DECL_DEBUG_EXPR, and remove any SSA_NAMEs from
it.
* dwarf2out.c: Include tree-flow.h.
(struct var_loc_node): Rename var_loc_note field to loc, add comment.
(size_of_loc_descr, output_loc_operands, output_loc_operands_raw):
Handle DW_OP_bit_piece.
(decl_piece_bitsize, decl_piece_varloc_ptr, decl_piece_node,
construct_piece_list, adjust_piece_list): New functions.
(add_var_loc_to_decl): Handle SRA optimized variables.
Adjust for var_loc_note to loc field renaming.
(dw_loc_list_1): For WANT_ADDRESS == 2 prefer DECL_MODE of decl
in VAR_LOCATION note.
(new_loc_descr_op_bit_piece): New function.
(dw_sra_loc_expr): New function.
(dw_loc_list): Use it.  Don't handle the last range after the
loop, handle it inside of the loop.  Adjust for var_loc_note
to loc field renaming.
(add_location_or_const_value_attribute): Only special case
single entry loc lists if loc is NOTE_P.  Adjust for
var_loc_note to loc field renaming.
(dwarf2out_var_location): Don't set newloc->var_loc_note
and newloc->next here.

* gcc.dg/guality/sra-1.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159357 138bc75d-0d04-0410-961f-82ee72b054a4

* tracebak.c (__gnat_backtrace): Mark top_stack with
ATTRIBUTE_UNUSED.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159356 138bc75d-0d04-0410-961f-82ee72b054a4

* cgraph.c (cgraph_mark_address_taken_node): No longer imply needed flag.
* cgraph.h (cgraph_only_called_directly_p,
cgraph_can_remove_if_no_direct_calls_p): test address_taken flag.
(cgraph_can_remove_if_no_direct_calls_and_refs_p): New function.
* cgraphunit.c (cgraph_mark_functions_to_output): Test address_taken.
(assemble
* ipa.c (cgraph_remove_unreachable_nodes): Use
cgraph_can_remove_if_no_direct_calls_and_refs_p; clear address_taken flags.
* tree-inline.c (copy_bb): Check address_taken flag.
* tree-profile.c (tree_gen_ic_func_profiler): Check address_taken and
externally_visible flag.

* tree-ssa/unreachable.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159354 138bc75d-0d04-0410-961f-82ee72b054a4

* typeck.c (build_array_ref): Take complain parm.
* cp-tree.h: Add it to prototype.
* call.c (build_new_op): Pass it.
* class.c (build_vtbl_ref): Pass it.
* decl2.c (grok_array_decl): Pass it.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159351 138bc75d-0d04-0410-961f-82ee72b054a4

PR bootstrap/44048
PR target/44099
gcc/cp:
* cp-tree.def (NULLPTR_TYPE): Remove.
* cp-tree.h (NULLPTR_TYPE_P): New.
(SCALAR_TYPE_P): Use it.
(nullptr_type_node): New.
(cp_tree_index): Add CPTI_NULLPTR_TYPE.
* decl.c (cxx_init_decl_processing): Call record_builtin_type on
nullptr_type_node.
* cvt.c (ocp_convert): Use NULLPTR_TYPE_P instead of NULLPTR_TYPE.
* cxx-pretty-print.c (pp_cxx_constant): Likewise.
* error.c (dump_type, dump_type_prefix, dump_type_suffix): Likewise.
* mangle.c (write_type): Likewise.
* name-lookup.c (arg_assoc_type): Likewise.
* typeck.c (build_reinterpret_cast_1): Likewise.
* rtti.c (typeinfo_in_lib_p): Likewise.
(emit_support_tinfos): Remove local nullptr_type_node.
gcc:
* dbxout.c (dbxout_type): Remove NULLPTR_TYPE handling.
* sdbout.c (plain_type_1): Likewise.
* dwarf2out.c (is_base_type): Likewise.
(gen_type_die_with_usage): Likewise.  Generate
DW_TAG_unspecified_type for any LANG_TYPE.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159350 138bc75d-0d04-0410-961f-82ee72b054a4

* cp-tree.h (UNKNOWN_TYPE): Remove.
* decl.c (cxx_init_decl_processing): Use LANG_TYPE instead.
* error.c (dumy_type, dump_type_prefix, dump_type_suffix): Likewise.
* typeck2.c (cxx_incomplete_type_diagnostic): Likewise.
* class.c (instantiate_type): Check unknown_type_node rather than
UNKNOWN_TYPE.
* name-lookup.c (maybe_push_decl): Likewise.
* rtti.c (get_tinfo_decl_dynamic): Likewise.
(get_typeid): Likewise.
* semantics.c (finish_offsetof): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159349 138bc75d-0d04-0410-961f-82ee72b054a4

Daily bump.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159348 138bc75d-0d04-0410-961f-82ee72b054a4

* tests/leak_test.c (main): Declare as int.  Return 0.
* tests/thread_leak_test.c (main): Ditto.
* tests/trace_test.c (main): Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159344 138bc75d-0d04-0410-961f-82ee72b054a4

* cgraphbuild.c (build_cgraph_edges, rebuild_cgraph_edges): Build
indrect edges too.
* cgraph.c (cgraph_create_indirect_edge): Take ecf_flags argument.
(cgraph_clone_edge): Update.
(cgraph_node_remove_callees): Remove indirect calls too.
* cgraph.h (cgraph_indirect_call_info): Add ecf_flags.
(cgraph_create_indirect_edge): Update prototype.
* ipa-reference.c (has_proper_scope_for_analysis): Rename to
is_proper_for_analysis.
(add_new_function, visited_nodes, function_insertion_hook_holder,
get_local_reference_vars_info, mark_address_taken, mark_address,
mark_load, mark_store, check_asm_memory_clobber, check_call,
scan_stmt_for_static_refs, scan_initializer_for_static_refs): Remove.
(ipa_init): Do not initialize visited_nodes;
function_insertion_hook_holder.
(analyze_variable): Rewrite.
(analyze_function): Rewrite.
(copy_local_bitmap): Remove.
(duplicate_node_dat): Do not duplicate local info.
(generate_summary): Simplify to only walk cgraph.
(write_node_summary_p, ipa_reference_write_summary,
ipa_reference_read_summary): Remove.
(propagate): Do not remove function insertion;
generate summary.
(pass_ipa_reference): NULLify summary handling fields.
* lto-cgraph.c (lto_output_edge): Output ecf_flags.
(input_edge): Input ecf_flags.
* ipa-prop.c (ipa_note_parm_call): Expect edge to be around.
(update_indirect_edges_after_inlining): Ignore edges with unknown
param.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159343 138bc75d-0d04-0410-961f-82ee72b054a4

* implicit-zee.c: New file.
* tree-pass.h (pass_implicit_zee): Declare.
* passes.c (init_optimization_passes): Add zee pass.
* common.opt (fzee): New flag.
* timevar.def (TV_ZEE): Define.
* config/i386/i386.c (optimization_options): Turn on ZEE for level 2
and beyond.
* Makefile.in (implicit-zee.o): Add new build file.
* gcc.target/i386/zee.c: New file.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159342 138bc75d-0d04-0410-961f-82ee72b054a4

* c-common.c (sync_resolve_params): Remove write-only variable.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159340 138bc75d-0d04-0410-961f-82ee72b054a4

* target.h (struct gcc_target): Add mode_dependent_address_p field.
* target-def.h (TARGET_MODE_DEPENDENT_ADDRESS_P): New.
(TARGET_INITIALIZER): Use TARGET_MODE_DEPENDENT_ADDRESS_P.
* targhooks.c (default_mode_dependent_address_p): New function.
* targhooks.h (default_mode_dependent_address_p): Declare function.
* doc/tm.texi (TARGET_MODE_DEPENDENT_ADDRESS_P): New.
(GO_IF_MODE_DEPENDENT_ADDRESS): Update.
* recog.c: (mode_dependent_address_p): Call mode_dependent_address_p
target hook. Change return type to bool.
* recog.h: (mode_dependent_address_p): Change return type to bool.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159339 138bc75d-0d04-0410-961f-82ee72b054a4

* MAINTAINERS (Write After Approval): Add myself.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159338 138bc75d-0d04-0410-961f-82ee72b054a4

PR c++/20669
* call.c (add_template_candidate_real): If deduction fails, still
add the template as a non-viable candidate.
(equal_functions): Handle template candidates.
(print_z_candidate): Likewise.
(print_z_candidates): Likewise.
(build_new_function_call): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159335 138bc75d-0d04-0410-961f-82ee72b054a4

* cp-tree.h (LOOKUP_LIST_ONLY): New.
* call.c (add_candidates): Enforce it.
(build_new_method_call): Try non-list ctor if no viable list ctor.
(build_user_type_conversion_1): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159334 138bc75d-0d04-0410-961f-82ee72b054a4

* call.c (add_candidates): Distinguish between type(x) and
x.operator type().
(convert_class_to_reference): Set LOOKUP_NO_CONVERSION.
(build_new_method_call): Give better error for conversion op.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159333 138bc75d-0d04-0410-961f-82ee72b054a4

* call.c (add_candidates): Add first_arg and return_type parms.
Add special constructor/conversion op handling.
(convert_class_to_reference): Use it.
(build_user_type_conversion_1): Likewise.
(build_op_call): Likewise.
(build_new_method_call): Likewise.
(build_new_op): Adjust.
(perform_overload_resolution): Adjust.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159332 138bc75d-0d04-0410-961f-82ee72b054a4

* tree-mudflap.c (build_function_type_0, build_function_type_1,
build_function_type_2, build_function_type_3): Remove.
(mudflap_init): Use build_function_type_list.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159328 138bc75d-0d04-0410-961f-82ee72b054a4

* coverage.c (build_fn_info_value): Call build_constructor instead of
build_constructor_from_list.
(build_ctr_info_value): Likewise.
(build_gcov_info): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159326 138bc75d-0d04-0410-961f-82ee72b054a4

* tree.c (build_constructor): Compute TREE_CONSTANT for the
resultant constructor.
(build_constructor_single): Don't set TREE_CONSTANT.
(build_constructor_from_list): Don't compute TREE_CONSTANT.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159325 138bc75d-0d04-0410-961f-82ee72b054a4

* cgraph.h (struct varpool_node): Add aux.
* varasm.c (find_decl_and_mark_needed): Force output of varpool nodes.
* varpool.c (varpool_remove_node): Do not remove initializer.
(varpool_reset_queue): Export.
(varpool_finalize_decl): Volatile vars are forced to be output.
* lto-symtab.c (lto_varpool_replace_node): Clear out initializer of
replaced decl.
* ipa.c (enqueue_cgraph_node, enqueue_varpool_node,
process_references, varpool_can_remove_if_no_refs): New functions.
(cgraph_remove_unreachable_nodes): Handle variables too.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159321 138bc75d-0d04-0410-961f-82ee72b054a4

Support AVX for cmpss/cmpsd.

gcc/

2010-05-12  H.J. Lu  <hongjiu.lu@intel.com>

PR target/44088
* config/i386/sse.md (*avx_vmmaskcmp<mode>3): New.

gcc/testsuite/

2010-05-12  H.J. Lu  <hongjiu.lu@intel.com>

PR target/44088
* gcc.target/i386/avx-cmpsd-1.c: New.
* gcc.target/i386/avx-cmpsd-2.c: Likewise.
* gcc.target/i386/avx-cmpss-1.c: Likewise.
* gcc.target/i386/avx-cmpss-2.c: Likewise.
* gcc.target/i386/sse-cmpss-1.c: Likewise.
* gcc.target/i386/sse2-cmpsd-1.c: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159319 138bc75d-0d04-0410-961f-82ee72b054a4

PR middle-end/44085
* gimplify.c (enum omp_region_type): Add ORT_UNTIED_TASK,
change value of ORT_TASK.
(new_omp_context): Handle ORT_UNTIED_TASK like ORT_TASK.
(omp_notice_threadprivate_variable): New function.
(omp_notice_variable): Call it for threadprivate variables.
If enclosing ctx is a task, print enclosing task rather than
enclosing parallel.  Handle ORT_UNTIED_TASK like ORT_TASK.
(gimplify_omp_task): Pass ORT_UNTIED_TASK instead of ORT_TASK
if task has untied clause.

* gcc.dg/gomp/pr44085.c: New test.
* gfortran.dg/gomp/pr44085.f90: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159316 138bc75d-0d04-0410-961f-82ee72b054a4

PR debug/42278
* dwarf2out.c (base_type_die): Don't add name attribute here.
(modified_type_die): Instead of sizetype use
its underlying original type.  If a DW_TAG_base_type doesn't
have name added, add __unknown__.
(dwarf2out_imported_module_or_decl_1): Don't call base_type_die,
always call force_type_die instead.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159315 138bc75d-0d04-0410-961f-82ee72b054a4

Add this change, missed from the previous commit (but already in the Changelog).

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159314 138bc75d-0d04-0410-961f-82ee72b054a4

* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Access_Type>: Tidy up
code, improve comments and fix formatting nits.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159312 138bc75d-0d04-0410-961f-82ee72b054a4

Add TLS checks to ObjC

* objc-obj-c++-shared/Object1.m: New.
* objc.dg/torture: New directory.
* objc.dg/torture/tls: Ditto.
* objc.dg/tls: Ditto.
* objc.dg/torture/tls/trivial.m: New test.
* objc.dg/torture/tls/thr-init-2.m: New test.
* objc.dg/torture/tls/thr-init-3.m: New test.
* objc.dg/torture/tls/thr-init.m: New test.
* objc.dg/torture/tls/diag-1.m: New test.
* objc.dg/torture/tls/tls.exp: New.
* objc.dg/torture/trivial.m: New test.
* objc.dg/torture/dg-torture.exp: New.
* objc.dg/tls/diag-3.m: New test.
* objc.dg/tls/diag-4.m: New test.
* objc.dg/tls/diag-5.m: New test.
* objc.dg/tls/init-1.m: New test.
* objc.dg/tls/init-2.m: New test.
* objc.dg/tls/tls.exp: New.
* objc.dg/tls/diag-2.m: New test.
* lib/objc.exp: Respond to dg-additional-files.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159311 138bc75d-0d04-0410-961f-82ee72b054a4

* targhooks.c (default_stack_protect_guard): Avoid sharing RTL
for __stack_chk_guard.

* gcc.target/m68k/20100512-1.c: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159310 138bc75d-0d04-0410-961f-82ee72b054a4

* gcc-interface/utils.c (update_pointer_to): Return early if the old
pointer already points to the new type.  Chain the old pointer and its
variants at the end of new pointer's chain after updating them.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159309 138bc75d-0d04-0410-961f-82ee72b054a4

* lto.c (materialize_cgraph): Revert my previous patch.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159305 138bc75d-0d04-0410-961f-82ee72b054a4

Daily bump.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159300 138bc75d-0d04-0410-961f-82ee72b054a4

/cp
2010-05-11  Paolo Carlini  <paolo.carlini@oracle.com>

PR c++/34272
PR c++/43630
PR c++/34491
* pt.c (process_partial_specialization): Return error_mark_node
in case of unused template parameters in partial specialization.

/testsuite
2010-05-11  Paolo Carlini  <paolo.carlini@oracle.com>

PR c++/34272
PR c++/43630
PR c++/34491
* g++.dg/template/crash97.C: New.
* g++.dg/template/crash98.C: Likewise.
* g++.dg/template/crash99.C: Likewise.
* g++.dg/cpp0x/pr31439.C: Adjust.
* g++.dg/template/crash95.C: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159295 138bc75d-0d04-0410-961f-82ee72b054a4

* c-opts.c (c_common_parse_file): If start_end_main_source_file,
don't call start_source_file debug hook here...
(finish_options): ... but here, after outputting predefined and
command line defines and undefs.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159293 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-11  Kai Tietz  <kai.tietz@onevision.com>

        * lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Rename to
        IMAGE_FILE_MACHINE_AMD64.
        * lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159290 138bc75d-0d04-0410-961f-82ee72b054a4

PR middle-end/44071
* cfglayout.c (fixup_reorder_chain): Allow asm goto to have
no fallthru edge.
* cfgcleanup.c (try_optimize_cfg): When in cfglayout mode
optimizing away empty bb with no successors, move over its
footer chain to fallthru predecessor.
* cfgrtl.c (patch_jump_insn): Update also REG_LABEL_OPERAND.
(rtl_split_edge): For asm goto call patch_jump_insn even if
splitting fallthru edge.

* c-c++-common/asmgoto-4.c: New test.
* gcc.target/i386/pr44071.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159288 138bc75d-0d04-0410-961f-82ee72b054a4

PR c++/44059
* config/elfos.h (ASM_DECLARE_OBJECT_NAME): Use qnu_unique_object
even for DECL_ONE_ONLY DECL_ARTIFICIAL !TREE_READONLY decls.
* config/alpha/elf.h (ASM_DECLARE_OBJECT_NAME): Likewise.
* dwarf2asm.c (dw2_output_indirect_constant_1): Set TREE_READONLY
on DW.ref.* decls.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159287 138bc75d-0d04-0410-961f-82ee72b054a4

PR c++/44062
* c-parser.c (c_parser_expression): Mark LHS of a comma
expression as read if it is a decl, handled component or
COMPOUND_EXPR with that on the RHS.
* c-typeck.c (c_process_expr_stmt): Mark RHS of COMPOUND_EXPR
if it is a decl or handled component.

* semantics.c (finish_expr_stmt): Don't call mark_exp_read here...
* cvt.c (convert_to_void): ... but here.  If expr is a COMPOUND_EXPR,
look at its second operand.

* c-c++-common/Wunused-var-7.c: New test.
* g++.dg/warn/Wunused-var-9.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159286 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/fortran/:
2010-05-11  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/43711
        * openmp.c (gfc_match_omp_taskwait): Report unexpected characters
        after OMP statement.
        (gfc_match_omp_critical): Likewise.
        (gfc_match_omp_flush): Likewise.
        (gfc_match_omp_workshare): Likewise.
        (gfc_match_omp_master): Likewise.
        (gfc_match_omp_ordered): Likewise.
        (gfc_match_omp_atomic): Likewise.
        (gfc_match_omp_barrier): Likewise.
        (gfc_match_omp_end_nowait): Likewise.

gcc/testsuite/:
2010-05-11  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/43711
        * gfortran.dg/gomp/pr43711.f90: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159282 138bc75d-0d04-0410-961f-82ee72b054a4

* lto.c (lto_fixup_decls): Remove global var decls freeing here.
(materialize_cgraph): Add it here.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159281 138bc75d-0d04-0410-961f-82ee72b054a4

* lto-symtab.c (lto_symtab_free): New function.
* lto-streamer.h (lto_symtab_free): Declare.

* lto-cgraph.c (reachable_from_other_partition_p): Export; do not assume
that if function is needed it is reachable.
(lto_output_node): See if it the function is reachable or referenced.
(output_cgraph): Update call of lto_output_node.
* lto-streamer.h (reachable_from_other_partition_p): Declare.

* lto.c (lto_fixup_decls): Free no longer needed lto_global_var_decls
vector.

* lto.c (lto_1_to_1_map): Remove some no longer needed checks.
(lto_promote_cross_file_statics): Never promote DECL_EXTERNAL;
use reachable_from_other_partition_p and
referenced_from_other_partition_p test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159280 138bc75d-0d04-0410-961f-82ee72b054a4

* crtstuff.c (__JCR_LIST__, __DTOR_END__, __JCR_END__, __FRAME_END__):
Mark as used.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159279 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/fortran/:
2010-05-11  Daniel Franke  <franke.daniel@gmail.com>

PR fortran/31820
* resolve.c (validate_case_label_expr): Removed FIXME.
(resolve_select): Raise default warning on case labels out of range
of the case expression.

gcc/testsuite/:
2010-05-11  Daniel Franke  <franke.daniel@gmail.com>

PR fortran/31820
* gfortran.dg/select_5.f90: Updated.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159278 138bc75d-0d04-0410-961f-82ee72b054a4

PR tree-optimize/44063
* ipa-inline.c (cgraph_edge_badness): Move always inlines to top of queue.
(cgraph_decide_inlining_of_small_function): Skip check when disrgarding
limits.
(estimate_function_body_sizes): Compute sizes even when disregarding.
* gcc.c-torture/compile/pr44063.c: New testcase.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159273 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-11  Kai Tietz  <kai.tietz@onevision.com>

        * collect2.c (maybe_lto_object_file): Add x64-coff magic and check.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159272 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-11  Kai Tietz  <kai.tietz@onevision.com>

        * lto-coff.c (validate_file): Add x64-coff support.
        * lto-coff.h (IMAGE_FILE_MACHINE_ADM64): New.
        (COFF_KNOWN_MACHINES): Add IMAGE_FILE_MACHINE_ADM64.
        * lto-lang.c (lto_build_c_type_nodes): Add check for
        'long long unsigned int' for x64-windows.
        (lto_init): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159271 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-11  Silvius Rus  <silvius.rus@gmail.com>

PR libstdc++/43259
* include/profile/impl/profiler_algos.h: New.
* include/Makefile.am: Add.
* include/Makefile.in: Regenerate.
* include/profile/impl/profiler.h
(_GLIBCXX_PROFILE_DEFINE_UNINIT_DATA): Add.
* include/profile/impl/profiler_trace.h
(__mutex_t, __lock, __unlock): Remove.
(__lock_object_table, __lock_stack_table): Remove. Replace uses with
calls to __gnu_cxx::__mutex::lock.
(__unlock_object_table, __unlock_stack_table): Remove. Replace uses
with calls to __gnu_cxx::__mutex::unlock.
(__warn, __cost_factor_writer, __cost_factor_setter): Add.
* testsuite/ext/profile/profiler_algos.cc: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159269 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-11  Silvius Rus  <silvius.rus@gmail.com>

PR libstdc++/43259
* include/profile/impl/profiler_algos.h: New.
* include/Makefile.am: Add.
* include/Makefile.in: Regenerate.
* include/profile/impl/profiler.h
(_GLIBCXX_PROFILE_DEFINE_UNINIT_DATA): Add.
* include/profile/impl/profiler_trace.h
(__mutex_t, __lock, __unlock): Remove.
(__lock_object_table, __lock_stack_table): Remove. Replace uses with
calls to __gnu_cxx::__mutex::lock.
(__unlock_object_table, __unlock_stack_table): Remove. Replace uses
with calls to __gnu_cxx::__mutex::unlock.
(__warn, __cost_factor_writer, __cost_factor_setter): Add.
* testsuite/ext/profile/profiler_algos.cc: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159268 138bc75d-0d04-0410-961f-82ee72b054a4

* lto-cgraph.c (output_cgraph): Remove loop adding all varpool nodes
into every boundary.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159267 138bc75d-0d04-0410-961f-82ee72b054a4

* matrix-reorg.c (matrix_reorg): Rebuild edges.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159263 138bc75d-0d04-0410-961f-82ee72b054a4

* lto-streamer.h (struct lto_streamer_cache_d): Nodes vector is in
heap.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159262 138bc75d-0d04-0410-961f-82ee72b054a4

* lto-streamer.c (lto_streamer_cache_add_to_node_array,
lto_streamer_cache_delete): Put nodes into heap.
(struct lto_streamer_cache_d): Nodes vector is in heap.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159261 138bc75d-0d04-0410-961f-82ee72b054a4

* cgraph.c (cgraph_mark_reachable_node): Accept references to optimized
out extern inlines.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159260 138bc75d-0d04-0410-961f-82ee72b054a4

* cgraphbuild.c (cgraph_rebuild_references): New.
(cgraph_mark_reachable_node): Accept references to optimized out
extern inlines.
* cgraph.h (cgraph_rebuild_references): Declare.
* tree-inline.c (tree_function_versioning): Use it.
* ipa-struct-reorg.c (do_reorg_for_func): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159259 138bc75d-0d04-0410-961f-82ee72b054a4

* cgraph.c: Include ipa-utils.h
(cgraph_create_virtual_clone): Update references.
* Makefile.in (cgraph.o): Add dependency at ipa-utils.h

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159258 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-11  Christian Borntraeger  <borntraeger@de.ibm.com>

        * tree-ssa-loop-prefetch.c (prune_ref_by_group_reuse): Reset
prefetch_before to PREFETCH_ALL if to accesses "meet" beyond
cache size.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159257 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-11  Christian Borntraeger  <borntraeger@de.ibm.com>

        * tree-ssa-loop-prefetch.c: Add debug for dropped prefetches.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159256 138bc75d-0d04-0410-961f-82ee72b054a4

* gcc.c (execute): For -### don't quote arguments that
contain just alphanumerics and _/-. characters.
* doc/invoke.texi: Document that change for -###.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159255 138bc75d-0d04-0410-961f-82ee72b054a4

PR debug/44023
* df-problems.c (struct dead_debug): Add to_rescan field.
(dead_debug_init): Clear to_rescan field.
(dead_debug_finish): Rescan all debug insns in to_rescan
bitmap and free the bitmap.
(dead_debug_insert_before): Instead of rescanning debug insns
immediately queue their rescanning until dead_debug_finish.
(df_note_bb_compute): After dead_debug_add do continue instead
of break.

* gcc.dg/pr44023.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159254 138bc75d-0d04-0410-961f-82ee72b054a4

Daily bump.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159251 138bc75d-0d04-0410-961f-82ee72b054a4

* exp_disp.adb (Make_Tags): Mark the imported view of dispatch tables
built for interfaces.
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Variable>: Use
imported_p instead of Is_Imported when considering constants.
Do not promote alignment of exported objects.
<E_Record_Subtype>: Strip all suffixes for dispatch table entities.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159247 138bc75d-0d04-0410-961f-82ee72b054a4

PR c++/44017
* semantics.c (baselink_for_fns): Revert earlier change.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159246 138bc75d-0d04-0410-961f-82ee72b054a4

PR c++/44045
* typeck.c (cp_build_modify_expr): Complain about assignment to
array from init list.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159243 138bc75d-0d04-0410-961f-82ee72b054a4

PR c++/43719
* decl.c (check_initializer): strip array type before checking for
uninitialized const or ref members.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159242 138bc75d-0d04-0410-961f-82ee72b054a4

PR debug/44028
* haifa-sched.c (schedule_insn): When clearing INSN_VAR_LOCATION_LOC,
clear also INSN_REG_USE_LIST.

* gcc.dg/pr44028.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159240 138bc75d-0d04-0410-961f-82ee72b054a4

* config/mips/mips.c (TARGET_SMALL_REGISTER_CLASSES_FOR_MODE_P): Undef.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159239 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/fortran/:
2010-05-10  Daniel Franke  <franke.daniel@gmail.com>

PR fortran/27866
PR fortran/35003
PR fortran/42809
* intrinsic.c (gfc_convert_type_warn): Be more discriminative
about conversion warnings.

gcc/testsuite/:
2010-05-08  Daniel Franke  <franke.daniel@gmail.com>

PR fortran/27866
PR fortran/35003
PR fortran/42809
* gfortran.dg/array_constructor_type_17.f03: Updated match string.
* gfortran.dg/warn_conversion.f90: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159238 138bc75d-0d04-0410-961f-82ee72b054a4

* lto-stramer-out.c (produce_asm_for_decls): Correct accidentally commited change.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159234 138bc75d-0d04-0410-961f-82ee72b054a4

* passes.c (ipa_write_summaries_1, ipa_write_optimization_summaries): Allocate
encoders.
* lto-section-out.c (lto_new_out_decl_state): Do not allocate it here.
* lto-streamer.c (lto_streamer_cache_insert_1): Use alloc pool.
(lto_streamer_cache_create): Init alloc pool.
(lto_streamer_cache_delete): Free alloc pool.
* lto-streamer.h: Include alloc pool.
(lto_streamer_cache_d): Use alloc pool.
* lto-stramer-out.c (produce_asm_for_decls): Delete fn_out_states.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159230 138bc75d-0d04-0410-961f-82ee72b054a4

* Makefile.in (cgraphbuild.o): Add dependency on except.h.
* cgraphbuild.c: Include except.h
(record_type_list, record_eh_tables): New function.
(build_cgraph_edges, rebuild_cgraph_edges): Use it.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159229 138bc75d-0d04-0410-961f-82ee72b054a4

* crtstuff.c (force_to_data, __do_global_dtors_aux_fini_array_entry,
__frame_dummy_init_array_entry, force_to_data): Attribute as used
rather than unused.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159228 138bc75d-0d04-0410-961f-82ee72b054a4

* ChangeLog: Fix whitespace.
* testsuite/ChangeLog: Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159227 138bc75d-0d04-0410-961f-82ee72b054a4

* tree-ssa-reassoc.c (undistribute_ops_list): Use create_tmp_reg.
(can_reassociate_p): Use FLOAT_TYPE_P.
* tree-vectorizer.h (vect_is_simple_reduction): Rename to ...
(vect_force_simple_reduction): ... this.
* tree-parloops.c (gather_scalar_reductions): Use
vect_force_simple_reduction.
* tree-vect-loop.c (vect_is_simple_reduction_1): Rename from
vect_is_simple_reduction, add modify argument, if true rewrite
"a-b" into "a+(-b)".
(vect_is_simple_reduction, vect_force_simple_reduction): New
functions.
(vect_analyze_scalar_cycles_1): Use vect_force_simple_reduction.

testsuite/
* gcc.dg/vect/fast-math-vect-reduc-8.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159226 138bc75d-0d04-0410-961f-82ee72b054a4

Nullify regno_allocno_map of the removed allocno.

gcc/

2010-05-10  H.J. Lu<hongjiu.lu@intel.com>
    Vladimir Makarov<vmakarov@redhat.com>

PR rtl-optimization/44012
* ira-build.c (remove_unnecessary_allocnos): Nullify
regno_allocno_map of the removed allocno.

gcc/testsuite/

2010-05-10  H.J. Lu  <hongjiu.lu@intel.com>

PR rtl-optimization/44012
* gcc.dg/pr44012.c: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159223 138bc75d-0d04-0410-961f-82ee72b054a4

* lib/lto.exp (lto_prune_vis_warns): Renamed to lto_prune_warns.
Log text on entry and exit.
Prune Sun ld warnings for common symbols with differing sizes.
(lto-link-and-maybe-run): Change caller.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159222 138bc75d-0d04-0410-961f-82ee72b054a4

* configure.ac (gcc_cv_ld_eh_gc_sections): Redirect objdump errors
to /dev/null.
* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159220 138bc75d-0d04-0410-961f-82ee72b054a4

* config/sol2.c (solaris_assemble_visibility): Declare decl, vis
unused.
Define visibility_types, name, type inside HAVE_GAS_HIDDEN.
* configure.ac (gcc_cv_ld_hidden): Explain stages of visibility
support in Sun ld.
* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159218 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-10  Janus Weil  <janus@gcc.gnu.org>

PR fortran/44044
* match.c (gfc_match_select_type): Move error message to
resolve_select_type.
* resolve.c (resolve_select_type): Error message moved here from
gfc_match_select_type. Correctly set type of temporary.

2010-05-10  Janus Weil  <janus@gcc.gnu.org>

PR fortran/44044
* gfortran.dg/class_7.f03: Modified.
* gfortran.dg/select_type_1.f03: Modified.
* gfortran.dg/select_type_12.f03: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159217 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-10  Richard Guenther  <rguenther@suse.de>

* lto-symtab.c (lto_symtab_entry_marked_p): Make entry
marked if the entry identifier is marked.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159216 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-10  Richard Guenther  <rguenther@suse.de>

* c-common.c (struct c_common_attributes): Add fnspec attribute.
(handle_fnspec_attribute): New function.
* gimple.h (gimple_call_return_flags): Declare.
(gimple_call_arg_flags): Likewise.
* gimple.c (gimple_call_arg_flags): New function.
(gimple_call_return_flags): Likewise.
* tree.h (EAF_DIRECT, EAF_NOCLOBBER, EAF_NOESCAPE, EAF_UNUSED):
New argument flags.
(ERF_RETURN_ARG_MASK, ERF_RETURNS_ARG, ERF_NOALIAS): New function
return value flags.
* tree-ssa-alias.c (ref_maybe_used_by_call_p_1): Skip unused args.
* tree-ssa-structalias.c (make_constraint_from_heapvar): Split
main work to ...
(make_heapvar_for): ... this new function.
(handle_rhs_call): Handle fnspec attribute argument specifiers.
(handle_lhs_call): Likewise.
(find_func_aliases): Adjust.

fortran/
* trans-decl.c (gfc_build_library_function_decl): Split out
worker to ...
(build_library_function_decl_1): ... this new function.
Set a fnspec attribute if a specification was provided.
(gfc_build_library_function_decl_with_spec): New function.
(gfc_build_intrinsic_function_decls): Annotate internal_pack
and internal_unpack.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159215 138bc75d-0d04-0410-961f-82ee72b054a4

2010-05-10  Richard Guenther  <rguenther@suse.de>

PR tree-optimization/44050
* tree-inline.c (tree_function_versioning): Clone the ipa-pta
flag.

* gcc.dg/torture/pr44050.c: New testcase.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159214 138bc75d-0d04-0410-961f-82ee72b054a4

* config/arm/thumb2.md (thumb2_tlobits_cbranch): New insn pattern.

* gcc.target/arm/pr42879.c: New testcase.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159212 138bc75d-0d04-0410-961f-82ee72b054a4

Daily bump.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159211 138bc75d-0d04-0410-961f-82ee72b054a4