- 09 Jan, 2006 5 commits
-
-
From-SVN: r109493
Ben Elliston committed -
From-SVN: r109490
Feng Wang committed -
2006-01-09 Feng Wang <fengwang@nudt.edu.cn> PR fortran/12456 * trans-expr.c (gfc_to_single_character): New function that converts string to single character if its length is 1. (gfc_build_compare_string):New function that compare string and handle single character specially. (gfc_conv_expr_op): Use gfc_build_compare_string. (gfc_trans_string_copy): Use gfc_to_single_character. * trans-intrinsic.c (gfc_conv_intrinsic_strcmp): Use gfc_build_compare_string. * trans.h (gfc_build_compare_string): Add prototype. testsuite ChangeLog entry: 2006-01-09 Feng Wang <fengwang@nudt.edu.cn> PR fortran/12456 * gfortran.dg/single_char_string.f90: New test. From-SVN: r109489
Feng Wang committed -
fortran/ 2006-01-09 Feng Wang <fengwang@nudt.edu.cn> * simplify.c (gfc_simplify_char): Use UCHAR_MAX instead of literal constant. (gfc_simplify_ichar): Get the result from unsinged char and in the range 0 to UCHAR_MAX instead of CHAR_MIN to CHAR_MAX. Testsuite ChangeLog entry: 2006-01-09 Feng Wang <fengwang@nudt.edu.cn> * gfortran.dg/intrinsic_i_char.f90: New test. From-SVN: r109488
Feng Wang committed -
From-SVN: r109484
GCC Administrator committed
-
- 08 Jan, 2006 7 commits
-
-
Co-Authored-By: David Edelsohn <edelsohn@gnu.org> From-SVN: r109475
Ian Lance Taylor committed -
fortran/ 2005-01-08 Erik Edelmann <eedelman@gcc.gnu.org> PR fortran/25093 * resolve.c (resolve_fntype): Check that PUBLIC functions aren't of PRIVATE type. testsuite/ 2005-01-08 Erik Edelmann <eedelman@gcc.gnu.org> PR fortran/25093 * gfortran.dg/private_type_4.f90: New. From-SVN: r109474
Erik Edelmann committed -
2006-01-08 Paolo Carlini <pcarlini@suse.de> PR libstdc++/22102 (insert as close to hint as possible) * include/bits/stl_tree.h (_Rb_tree<>::_M_insert_lower, _M_insert_equal_lower): New. (_M_insert_equal(iterator, const _Val&), _M_insert_equal(const_iterator, const _Val&)): Use the above. * docs/html/ext/howto.html: Add an entry for DR 233. * testsuite/23_containers/multiset/modifiers/insert/22102.cc: New. * testsuite/23_containers/multimap/modifiers/insert/22102.cc: New. * testsuite/23_containers/set/insert/: Move... * testsuite/23_containers/set/modifiers/insert/: ...here. * testsuite/23_containers/map/insert/: Move... * testsuite/23_containers/map/modifiers/insert/: ...here. * testsuite/23_containers/multiset/insert/: Move... * testsuite/23_containers/multiset/modifiers/insert/: ...here. From-SVN: r109473
Paolo Carlini committed -
2006-01-08 Richard Guenther <rguenther@suse.de> * tree-ssa-structalias.c (get_constraint_for): Remove anyoffset argument. (get_constraint_for_component_ref): Likewise. (do_deref): Likewise. (get_constraint_for): Likewise. (do_structure_copy): Likewise. (handle_ptr_arith): Likewise. (find_func_aliases): Likewise. Remove unused need_anyoffset variable. From-SVN: r109472
Richard Guenther committed -
* config/sh/sh.h (CONST_OK_FOR_K16): Define. (CONST_OK_FOR_K): Add CONST_OK_FOR_K16 case. (EXTRA_CONSTRAINT_C16): Remove. (EXTRA_CONSTRAINT_Css, EXTRA_CONSTRAINT_Csu): Define. (EXTRA_CONSTRAINT_C): Remove EXTRA_CONSTRAINT_C16 case and add EXTRA_CONSTRAINT_Css and EXTRA_CONSTRAINT_Csu cases. * config/sh/sh.c (print_operand): Handle unsigned 16-bit symbolic constants of SHmedia. Handle nested constant expressions of SHmedia correctly. (andcosts): Fix the costs for SHmedia constants. (sh_rtx_costs): Take account of outer_code for SHmedia constants. * config/sh/sh.md (*movsi_media): Use Css constraint instead of C16. (*movsi_media_nofpu, *movqi_media, *movhi_media): Likewise. (*movdi_media, *movdi_media_nofpu, movv8qi_i, movv2hi_i): Likewise. (movv4hi_i, movv2si_i): Likewise. (movsi_const): Adjust the second operand of ior so to match with the Csu constraint. (movdi_const, movdi_const_32bit): Likewise. (movdi_const_16bit+1): Don't sign-extend LOW. (movdi_const_16bit+2): Likewise. Remove the zero_extend and truncate step. (*double_shori): Fix the split condition. Use GEN_INT instead of get_int_mode calls. Mask lower 16-bit of the argument of the last GEN_INT. (sym2GOTPLT): Remove. (symGOTPLT2reg): Replace gen_sym2GOTPLT with gen_rtx_CONST and gen_rtx_UNSPEC. * config/sh/predicates.md (arith_operand): Use EXTRA_CONSTRAINT_Css instead of EXTRA_CONSTRAINT_C16. Co-Authored-By: Kaz Kojima <kkojima@gcc.gnu.org> From-SVN: r109471
J"orn Rennecke committed -
From-SVN: r109466
Jerry DeLisle committed -
From-SVN: r109463
GCC Administrator committed
-
- 07 Jan, 2006 11 commits
-
-
2005-01-07 Ian Lance Taylor <ian@airs.com> David Edelsohn <edelsohn@gnu.org> PR rtl-optimization/25662 * optabs.c (simplify_expand_binop): Use simplify_binary_operation for constant operands instead of simplify_gen_binary. * simplify-rtx.c (simplify_gen_binary): Swap commutative operands after trying simplify_binary_operation Co-Authored-By: David Edelsohn <edelsohn@gnu.org> From-SVN: r109456
Ian Lance Taylor committed -
2006-01-07 Janne Blomqvist <jb@gcc.gnu.org> * configure.ac: Remove check for sys/mman.h. * configure: Regenerated. * Makefile.in: Regenerated. * config.h.in: Regenerated. * aclocal.m4: Regenerated. From-SVN: r109455
Janne Blomqvist committed -
2005-01-07 Richard Guenther <rguenther@suse.de> * gcc.dg/tree-ssa/loop-15.c: Use optimized dump. From-SVN: r109454
Richard Guenther committed -
PR libgcj/24940 * shlibpath.m4: Replace $SED with sed. * configure: Rebuilt. From-SVN: r109452
Jakub Jelinek committed -
fortran/ * decl.c (gfc_match_function_decl): Correctly error out in case of omitted function argument list. testsuite/ * gfortran.dg/func_decl_1.f90: New. * gfortran.dg/array_alloc_1.f90: Fix wrong function declaration. * gfortran.dg/array_alloc_2.f90: Likewise. * gfortran.dg/char_result_8.f90: Likewise. * gfortran.dg/dup_save_1.f90: Likewise. * gfortran.dg/dup_save_2.f90: Likewise. * gfortran.dg/f2c_6.f90: Likewise. * gfortran.dg/f2c_7.f90: Likewise. * gfortran.dg/func_result_2.f90: Likewise. * gfortran.fortran-torture/execute/pr23373-2.f90: Likewise. From-SVN: r109451
Tobias Schlüter committed -
2006-01-07 Paul Thomas <pault@gcc.gnu.org> * gfortran.dg/assumed_size_refs_2.f90: Delete svn:executable. * gfortran.dg/pointer_assign_1.f90: Delete svn:executable. * gfortran.dg/assumed_size_refs_1.f90: Delete svn:executable. * gfortran.dg/arrayio_0.f90: Delete svn:executable. From-SVN: r109450
Paul Thomas committed -
2006-01-07 Paul Thomas <pault@gcc.gnu.org> PR fortran/22146 * trans-array.c (gfc_reverse_ss): Remove static attribute. (gfc_walk_elemental_function_args): Replace gfc_expr * argument for the function call with the corresponding gfc_actual_arglist*. Change code accordingly. (gfc_walk_function_expr): Call to gfc_walk_elemental_function_args now requires the actual argument list instead of the expression for the function call. * trans-array.h: Modify the prototype for gfc_walk_elemental_function_args and provide a prototype for gfc_reverse_ss. * trans-stmt.h (gfc_trans_call): Add the scalarization code for the case where an elemental subroutine has array valued actual arguments. PR fortran/25029 PR fortran/21256 PR fortran/20868 PR fortran/20870 * resolve.c (check_assumed_size_reference): New function to check for upper bound in assumed size array references. (resolve_assumed_size_actual): New function to do a very restricted scan of actual argument expressions of those procedures for which incomplete assumed size array references are not allowed. (resolve_function, resolve_call): Switch off assumed size checking of actual arguments, except for elemental procedures and intrinsic inquiry functions, in some circumstances. (resolve_variable): Call check_assumed_size_reference. 2006-01-07 Paul Thomas <pault@gcc.gnu.org> PR fortran/22146 * gfortran.dg/elemental_subroutine_1.f90: New test. * gfortran.dg/elemental_subroutine_2.f90: New test. PR fortran/25029 PR fortran/21256 * gfortran.dg/assumed_size_refs_1.f90: New test. PR fortran/20868 PR fortran/20870 * gfortran.dg/assumed_size_refs_2.f90: New test. * gfortran.dg/initialization_1.f90: Change warning message. From-SVN: r109449
Paul Thomas committed -
2006-01-06 Daniel Berlin <dberlin@dberlin.org> * tree.c (iterative_hash_expr): Hash decls based on UID. From-SVN: r109448
Daniel Berlin committed -
From-SVN: r109447
Jerry DeLisle committed -
* java/lang/Character.java (SIZE, MAX_CACHE, charCache, MIN_SURROGATE, MAX_SURROGATE): New fields from Classpath. (MIN_HIGH_SURROGATE, MAX_HIGH_SURROGATE, MIN_LOW_SURROGATE, MAX_LOW_SURROGATE): Javadoc fixes. (valueOf, reverseBytes, isHighSurrogate, isLowSurrogate, isSurrogatePair, toCodePoint, codePointAt, codePointBefore): New methods from Classpath. * java/lang/String.java (codePointAt, codePointBefore, codePointCount, contains, replace): New methods from Classpath. (contentEquals): Declare. * java/lang/natString.cc (contentEquals): New method. From-SVN: r109445
Tom Tromey committed -
From-SVN: r109442
GCC Administrator committed
-
- 06 Jan, 2006 17 commits
-
-
2006-01-06 Eric Christopher <echristo@apple.com> * doc/tm.texi (TARGET_ASM_EMIT_EXCEPT_TABLE_LABEL): Document. (TARGET_UNWIND_EMIT): Fix spelling. * target.h (gcc_target): Add except_table_label. * except.c (output_function_exception_table): Use. * varasm.c (default_emit_except_table_label): New. * target-def.h (TARGET_ASM_EMIT_EXCEPT_TABLE_LABEL): New default define. (asm_out): Add here. * output.h (default_emit_except_table_label): Prototype. * config/darwin-protos.h (darwin_emit_except_table_label): Ditto. * config/darwin.c (darwin_emit_except_table_label): Define. * config/darwin.h (TARGET_ASM_EMIT_EXCEPT_TABLE): Ditto. From-SVN: r109435
Eric Christopher committed -
* gcj.texi (Arrays): Added more documentation for JvNewObjectArray. (Primitive types): Correct information about primitive classes. (Reference types): New node. (Index): New node. From-SVN: r109432
Tom Tromey committed -
parser.c (cp_parser_primary_expression): Document the grammar for the built-in offsetof, a GNU extension. * parser.c (cp_parser_primary_expression): Document the grammar for the built-in offsetof, a GNU extension. From-SVN: r109431
Gabriel Dos Reis committed -
From-SVN: r109429
Joseph Myers committed -
PR tree-optimization/18527 * tree-ssa-loop-niter.c (number_of_iterations_cond, number_of_iterations_special, number_of_iterations_exit): Move base and step of an iv to a single structure. Add no_overflow flag, and use it in # of iterations analysis. * tree-scalar-evolution.c (analyze_scalar_evolution_in_loop): Add folded_casts argument. (simple_iv): Pass base and step in a structure. Set no_overflow flag. (scev_const_prop): Add argument to analyze_scalar_evolution_in_loop. Evaluate expensiveness of computing # of iterations instead of the final expression. * tree-scalar-evolution.h (affine_iv): New structure. (simple_iv): Declaration changed. * tree-chrec.c (chrec_apply): Handle chrecs containing symbols. * tree-ssa-loop-ivopts.c (determine_biv_step, find_givs_in_stmt_scev, find_givs_in_stmt): Changed due to simple_iv change. * gcc.dg/tree-ssa/loop-15.c: New test. From-SVN: r109427
Zdenek Dvorak committed -
PR libgcj/23499: * lib/Makefile.in: Rebuilt. * lib/Makefile.am (glibj_DATA): Commented out. From-SVN: r109426
Tom Tromey committed -
2006-01-06 Paolo Carlini <pcarlini@suse.de> * include/bits/stl_tree.h (_Rb_tree<>::insert_unique): Rename to _M_insert_unique. (_Rb_tree<>::insert_equal): Rename to _M_insert_equal. * include/bits/stl_map.h (class map<>): Update callers. * include/bits/stl_set.h (class set<>): Likewise. * include/bits/stl_multimap.h (class multimap<>): Likewise. * include/bits/stl_multiset.h (class multiset<>): Likewise. From-SVN: r109424
Paolo Carlini committed -
2005-12-26 Anthony Green <green@redhat.com> * gnu/java/nio/SocketChannelImpl.java (read): Compute the right amount of data to read (dst.remaining()). * gnu/java/nio/DatagramChannelImpl.java (receive): Ditto. 2005-11-11 Mark Wielaard <mark@klomp.org> Reported by john.zigman@anu.edu.au as bug #24608. * gnu/java/nio/SocketChannelImpl.java (read): Put readBytes in destination ByteBuffer when it doesn't have an array instead of len bytes. From-SVN: r109422
Tom Tromey committed -
* tree-cfg.c (bsi_replace): Rename final argument from PRESERVE_EH_INFO to UPDATE_EH_INFO. Fix typo in last change (stmt -> orig_stmt). * tree-eh.c (verify_eh_throw_stmt_node): New function. (bsi_remove): Add new argument. Remove EH information if requested. (verify_eh_throw_table_statements): New function. (bsi_remove): Add new argument REMOVE_EH_INFO. All callers updated. * tree-optimize.c (execute_free_cfg_annotations): Verify the EH throw statement table after removing annotations. * except.h (verify_eh_throw_table_statements): Prototype. * tree-flow.h (bsi_remove): Update prototype. * tree-vrp.c (remove_range_assertions): Add new argument to bsi_remove call. * tree-ssa-loop-im.c (move_computations_stmt): Likewise. * tree-complex.c (expand_complex_div_wide): Likewise. * tree-ssa-threadupdate.c (remove_ctrl_stmt_and_useless_edges): Likewise * tree-tailcall.c (eliminate_tailcall): Likewise. * tree-ssa-dse.c (dse_optimize_stmt): Likewise. * tree-ssa-loop-ivopts.c (remove_statement): Likewise. * tree-nrv.c (tree_nrv): Likewise. * tree-vectorizer.c (slpeel_make_loop_iterate_ntimes): Likewise. * tree-if-conv.c (tree_if_convert_cond_expr): Likewise. (combine_blocks): Likewise. * tree-ssa-phiopt.c (replace_phi_edge_with_variable): Likewise. * tree-cfgcleanup.c (cleanup_ctrl_expr_graph): Likewise. (cleanup_control_flow): Likewise. (remove_forwarder_block): Likewise. * tree-ssa-pre.c (remove_dead_inserted_code): Likewise. * tree-sra.c (sra_replace): Likewise. * tree-ssa-forwprop.c (forward_propagate_into_cond): Likewise. (forward_propagate_single_use_vars): Likewise. * tree-ssa-dce.c (remove_dead_stmt): Likewise. * tree-inline.c (expand_call_inline): Likewise. * tree-vect-transform.c (vect_transform_loop): Likewise. * tree-outof-ssa.c (rewrite_trees): Likewise. * tree-cfg.c (make_goto_expr_edges): Likewise. (cleanup_dead_labels): Likewise. (tree_merge_blocks, remove_bb, disband_implicit_edges): Likewise. (bsi_move_before, bsi_move_after): Likewise. (bsi_move_to_bb_end, try_redirect_by_replacing_jump): Likewise (tree_redirect_edge_and_branch, tree_split_block): Likewise. From-SVN: r109421
Jeff Law committed -
2006-01-06 Andrew Pinski <pinskia@physics.uc.edu> PR tree-opt/25528 * tree-ssa-alias.c (find_used_portions): Handle REALPART_EXPR and IMAGPART_EXPR. * tree-flow-inline.h (var_can_have_subvars): Handle complex types on non gimple variables. Also add checks at the top for decls and mtags. * tree-ssa-structalias.c (push_fields_onto_fieldstack): Handle complex types. * tree-ssa-operands.c (parse_ssa_operands): Handle REALPART_EXPR and IMAGPART_EXPR for creating MUST_DEFs. (get_expr_operands): Handle SSA_NAME, STRUCT_FIELD_TAG, TYPE_MEMORY_TAG, and NAME_MEMORY_TAG separately from the DECLs. From-SVN: r109419
Andrew Pinski committed -
From-SVN: r109417
Tobias Schlüter committed -
2006-01-06 Richard Guenther <rguenther@suse.de> * tree-dfa.c (mark_new_vars_to_rename): Create stmt annotation, if necessary. * tree-ssa-pre.c (create_expression_by_pieces): Remove redundant calls to update_stmt. * tree-ssa-forwprop.c (tidy_after_forward_propagate_addr): Likewise. From-SVN: r109416
Richard Guenther committed -
2006-01-06 Paolo Carlini <pcarlini@suse.de> * include/bits/stl_bvector.h (vector<bool>::erase(iterator, iterator)): Just use _M_erase_at_end. 2006-01-06 Paolo Carlini <pcarlini@suse.de> * include/bits/stl_bvector.h (class vector<bool>): Move all the helpers under protected access mode, consistently with the primary vector template. (vector<bool>::_M_erase_at_end): Add. (erase(iterator, iterator), clear, resize, _M_fill_assign, _M_assign_aux): Use it. * testsuite/23_containers/vector/bool/modifiers/erase/1.cc: New. 2006-01-06 Paolo Carlini <pcarlini@suse.de> Implement Option 3 of DR 431 for vector<bool>. * include/bits/stl_bvector.h (class _Bvector_base): Change to a struct, consistently with the primary vector template. (class vector<bool>): Adjust to protected inheritance, tidy typedefs. (_Bvector_base<>::_M_get_Bit_allocator): Add. (vector<bool>::vector(const vector&)): Use it. (_Bvector_base<>::get_allocator): Tidy. (vector<bool>::swap): Use __alloc_swap. * testsuite/23_containers/vector/bool/modifiers/swap/1.cc: New. * testsuite/23_containers/vector/bool/modifiers/swap/2.cc: New. From-SVN: r109415
Paolo Carlini committed -
2006-01-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libgfortran/25598 * io/file_pos.c (unformatted_backspace): Assure the new file position to seek is not less than zero. (st_backspace): Set unit bytes_left to zero. * io/transfer.c (next_record_r): Fix line lengths, no functional change. Fix date on ChangeLog From-SVN: r109408
Jerry DeLisle committed -
2006-01-05 Paolo Carlini <pcarlini@suse.de> * testsuite/testsuite_hooks.h (test_tm(unsigned)): Change to take all the tm members. * testsuite/testsuite_hooks.cc (test_tm): Adjust. * testsuite/22_locale/time_put/put/wchar_t/10.cc: Update. * testsuite/22_locale/time_put/put/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/3.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/5.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/6.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/7.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/8.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/9.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/17038.cc: Likewise. * testsuite/22_locale/time_put/put/char/10.cc: Likewise. * testsuite/22_locale/time_put/put/char/1.cc: Likewise. * testsuite/22_locale/time_put/put/char/2.cc: Likewise. * testsuite/22_locale/time_put/put/char/3.cc: Likewise. * testsuite/22_locale/time_put/put/char/4.cc: Likewise. * testsuite/22_locale/time_put/put/char/5.cc: Likewise. * testsuite/22_locale/time_put/put/char/6.cc: Likewise. * testsuite/22_locale/time_put/put/char/7.cc: Likewise. * testsuite/22_locale/time_put/put/char/8.cc: Likewise. * testsuite/22_locale/time_put/put/char/9.cc: Likewise. * testsuite/22_locale/time_put/put/char/17038.cc: Likewise. * testsuite/22_locale/time_get/get_year/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_year/wchar_t/3.cc: Likewise. * testsuite/22_locale/time_get/get_year/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_year/char/3.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/char/2.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/wchar_t/3.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/2.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/3.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/12750.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/12750.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/3.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/12750.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/12750.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/2.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/3.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/3.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/4.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/2.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/3.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/4.cc: Likewise. From-SVN: r109407
Paolo Carlini committed -
2005-01-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/25598 * gfortran.dg/backspace_3.f: New test. * gfortran.dg/backspace_4.f: New test. From-SVN: r109406
Jerry DeLisle committed -
2006-01-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libgfortran/25598 * io/file_pos.c (unformatted_backspace): Assure the new file position to seek is not less than zero. (st_backspace): Set unit bytes_left to zero. * io/transfer.c (next_record_r): Fix line lengths, no functional change. From-SVN: r109405
Jerry DeLisle committed
-