Commit Graph

124710 Commits

Author SHA1 Message Date
Uros Bizjak
b5ff10f3ad compatibility.cc (_ZTIe): Use reinterpret_cast<const cast *> to avoid -Wcast-qual warnings.
* src/c++98/compatibility.cc (_ZTIe): Use
	reinterpret_cast<const cast *> to avoid -Wcast-qual warnings.
	(_ZTIPe): Ditto.
	(ZTIPKe): Ditto.

From-SVN: r201729
2013-08-14 16:59:46 +02:00
Andrey Belevantsev
e839e2a931 re PR rtl-optimization/57662 (ICE: SIGSEGV in code_motion_process_successors with -fschedule-insns2 -fselective-scheduling2)
PR rtl-optimization/57662

gcc/
	* sel-sched.c (code_motion_process_successors): When the current insn
	is removed after the recursive traversal, break from the loop.
	Add comments and debug printouts.

testsuite/

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

From-SVN: r201728
2013-08-14 18:31:26 +04:00
Uros Bizjak
aec9ba36b1 compatibility.cc (_ZTIe): Use (const cast *) to avoid -Wcast-qual warnings.
* src/c++98/compatibility.cc (_ZTIe): Use (const cast *)
	to avoid -Wcast-qual warnings.
	(_ZTIPe): Ditto.
	(ZTIPKe): Ditto.

From-SVN: r201727
2013-08-14 16:22:56 +02:00
Uros Bizjak
346334d240 compatibility.cc (_ZTIe): Use const_cast to avoid warning.
* src/c++98/compatibility.cc (_ZTIe): Use const_cast to avoid warning.
	(_ZTIPe): Ditto.
	(ZTIPKe): Ditto.

From-SVN: r201723
2013-08-14 13:27:56 +02:00
Jakub Jelinek
27ed665fd6 re PR target/58067 (ICE in GFortran recog.c:2158)
PR target/58067
	* config/i386/i386.c (ix86_delegitimize_address): For CM_MEDIUM_PIC
	and CM_LARGE_PIC ix86_cmodel fall thru into the -m32 code, handle
	there also UNSPEC_PLTOFF.

Co-Authored-By: Alexandre Oliva <aoliva@redhat.com>

From-SVN: r201720
2013-08-14 11:09:58 +02:00
Marek Polacek
61c1a609ee ipa-inline-analysis.c (add_clause): Avoid shifting integer NUM_CONDITIONS bit positions.
* ipa-inline-analysis.c (add_clause): Avoid shifting integer
NUM_CONDITIONS bit positions.

From-SVN: r201719
2013-08-14 04:44:37 +00:00
GCC Administrator
d753b1363d Daily bump.
From-SVN: r201717
2013-08-14 00:16:49 +00:00
Cary Coutant
0e901c6787 dwarf2out.c (CHECKSUM_BLOCK): New macro.
gcc/
	* dwarf2out.c (CHECKSUM_BLOCK): New macro.
	(attr_checksum): Hash vector contents instead of pointer.
	(attr_checksum_ordered): Likewise.

From-SVN: r201712
2013-08-13 16:39:54 -07:00
Maciej W. Rozycki
53781c0df3 nan-legacy.c: Accept 4294967295 as an alternative to -1.
* gcc.target/mips/nan-legacy.c: Accept 4294967295 as an
	alternative to -1.
	* gcc.target/mips/nans-legacy.c: Likewise.

From-SVN: r201711
2013-08-13 21:39:26 +00:00
Maciej W. Rozycki
888dc0f219 fabs-2008.c: Correct scan-assembler pattern escapes.
* gcc.target/mips/fabs-2008.c: Correct scan-assembler pattern
	escapes.
	* gcc.target/mips/fabs-legacy.c: Likewise.
	* gcc.target/mips/fabsf-2008.c: Likewise.
	* gcc.target/mips/fabsf-legacy.c: Likewise.
	* gcc.target/mips/fneg-2008.c: Likewise.
	* gcc.target/mips/fneg-legacy.c: Likewise.
	* gcc.target/mips/fnegf-2008.c: Likewise.
	* gcc.target/mips/fnegf-legacy.c: Likewise.
	* gcc.target/mips/nan-2008.c: Likewise.
	* gcc.target/mips/nan-legacy.c: Likewise.
	* gcc.target/mips/nanf-2008.c: Likewise.
	* gcc.target/mips/nanf-legacy.c: Likewise.
	* gcc.target/mips/nans-2008.c: Likewise.
	* gcc.target/mips/nans-legacy.c: Likewise.
	* gcc.target/mips/nansf-2008.c: Likewise.
	* gcc.target/mips/nansf-legacy.c: Likewise.

From-SVN: r201710
2013-08-13 21:36:47 +00:00
Uros Bizjak
061eff6d92 sse.md (*sse2_maskmovdqu): Emit addr32 prefix when Pmode != word_mode.
* config/i386/sse.md (*sse2_maskmovdqu): Emit addr32 prefix
	when Pmode != word_mode.  Add length_address attribute.
	(sse3_monitor_<mode>): Merge from sse3_monitor and
	sse3_monitor64_<mode> insn patterns.  Emit addr32 prefix when
	Pmode != word_mode.  Update insn length attribute.
	* config/i386/i386.c (ix86_option_override_internal): Update
	ix86_gen_monitor selection for merged sse3_monitor insn.

From-SVN: r201708
2013-08-13 22:45:27 +02:00
Eric Botcazou
5ff3a1f733 decl.c (gnat_to_gnu_entity): Do not bother about alias sets of derived types in ASIS mode.
* gcc-interface/decl.c (gnat_to_gnu_entity): Do not bother about alias
	sets of derived types in ASIS mode.

From-SVN: r201705
2013-08-13 19:58:24 +00:00
Eric Botcazou
78df6221f9 decl.c (gnat_to_gnu_entity): Replace True with true.
* gcc-interface/decl.c (gnat_to_gnu_entity): Replace True with true.
	(is_cplusplus_method): Likewise, and False with false.
	(components_need_strict_alignment): Likewise.
	* gcc-interface/misc.c (gnat_init_gcc_fp): Likewise.
	* gcc-interface/trans.c (Loop_Statement_to_gnu): Likewise.
	(Handled_Sequence_Of_Statements_to_gnu): Likewise.
	(add_cleanup): Likewise.
	(Sloc_to_locus1): Likewise.
	(Sloc_to_locus): Likewise.
	(set_expr_location_from_node): Likewise.
	* gcc-interface/utils.c (potential_alignment_gap): Likewise.

From-SVN: r201704
2013-08-13 19:53:37 +00:00
Thomas Quinot
1d3db14c1e trans.c (set_end_locus_from_node): Clear column info for the end_locus of a block if...
* gcc-interface/trans.c (set_end_locus_from_node): Clear column info
	for the end_locus of a block if it does not come from an End_Label.

From-SVN: r201703
2013-08-13 19:49:21 +00:00
Thomas Quinot
362db0b23d trans.c (Handled_Sequence_Of_Statements_to_gnu): If there is no End_Label...
* gcc-interface/trans.c (Handled_Sequence_Of_Statements_to_gnu): If
	there is no End_Label, attach cleanup actions to the sloc of the HSS
	node instead.
	(Exception_Handler_to_gnu_zcx): Associate cleanup actions with the sloc
	of the handler itself.
	(add_cleanup): Clear column information in sloc of cleanup actions.
	(Sloc_to_locus1): New static function.
	(Sloc_to_locus): Call it.
	(set_expr_location_from_node1): New static function.
	(set_expr_location_from_node): Call it.

From-SVN: r201702
2013-08-13 19:43:47 +00:00
Julian Brown
8ec9249b2a rs6000.c (rs6000_legitimize_reload_address): Don't perform invalid legitimization on greater-than-word-size modes for...
* config/rs6000/rs6000.c (rs6000_legitimize_reload_address): Don't
	perform invalid legitimization on greater-than-word-size modes for
	TARGET_E500_DOUBLE.

From-SVN: r201701
2013-08-13 17:33:09 +00:00
Eric Botcazou
bb29e9ff3e trans.c (Call_to_gnu): Deal with specific conditional expressions for misaligned actual parameters.
* gcc-interface/trans.c (Call_to_gnu): Deal with specific conditional
	expressions for misaligned actual parameters.

From-SVN: r201700
2013-08-13 17:13:47 +00:00
Vladimir Makarov
761a8eb70a ira.c (setup_class_translate_array): Use aclass instead of cl for classes not fully covered by allocno classes.
2013-08-13  Vladimir Makarov  <vmakarov@redhat.com>

	* ira.c (setup_class_translate_array): Use aclass instead of cl
	for classes not fully covered by allocno classes.

From-SVN: r201699
2013-08-13 17:10:07 +00:00
Jakub Jelinek
4029a5e063 re PR middle-end/57661 (ICE: SIGSEGV in verify_ssa)
PR tree-optimization/57661
	* tree-inline.h (struct copy_body_data): Add blocks_to_copy field.
	* tree-inline.c (tree_function_versioning): Initialize it.
	(remap_gimple_stmt): Return GIMPLE_NOP for MEM_REF lhs clobber stmts
	if id->blocks_to_copy and MEM_REF's SSA_NAME is defined in a block
	that is not being copied.

	* g++.dg/opt/pr57661.C: New test.

From-SVN: r201698
2013-08-13 19:06:13 +02:00
Jakub Jelinek
99c2bd544a re PR middle-end/56417 (internal compiler error: verify_gimple failed)
PR sanitizer/56417
	* asan.c (instrument_strlen_call): Fix typo in comment.
	Use char * type even for the lhs of POINTER_PLUS_EXPR.

	* gcc.dg/asan/pr56417.c: New test.

From-SVN: r201696
2013-08-13 18:58:46 +02:00
Eric Botcazou
2efdbf0f3c trans.c (can_equal_min_or_max_val_p): Be prepared for values outside of the range of the type.
* gcc-interface/trans.c (can_equal_min_or_max_val_p): Be prepared for
	values outside of the range of the type.

From-SVN: r201692
2013-08-13 15:52:26 +00:00
Steve Ellcey
b5f8f063a7 mips.md (prefetch): Use lw instead of ld on loongson in 32bit mode.
2013-08-13  Steve Ellcey  <sellcey@mips.com>

	* config/mips/mips.md (prefetch): Use lw instead of ld on
	loongson in 32bit mode.

From-SVN: r201691
2013-08-13 15:49:39 +00:00
Nick Clifton
4de80584ef * config.gcc: (avr-linux): Allow for tmake_file not being empty.
From-SVN: r201690
2013-08-13 15:42:17 +00:00
Maciej W. Rozycki
2dc14aac5b * config.host <mips*-*-linux*>: Remove a stray comment.
From-SVN: r201689
2013-08-13 14:26:49 +00:00
Marek Polacek
022bd4c2d5 * gcc.dg/pr57980.c: Use vector of two elements, not just one.
From-SVN: r201686
2013-08-13 13:23:55 +00:00
Jan Hubicka
09ce36608d cgraph.c (cgraph_turn_edge_to_speculative): Return newly introduced edge; fix typo in sanity check.
* cgraph.c (cgraph_turn_edge_to_speculative): Return newly
	introduced edge; fix typo in sanity check.
	(cgraph_resolve_speculation): Export; improve diagnostic.
	(cgraph_redirect_edge_call_stmt_to_callee): Better diagnostic; cancel
	speculation at type mismatch.
	* cgraph.h (cgraph_turn_edge_to_speculative): Update.
	(cgraph_resolve_speculation): Declare.
	(symtab_can_be_discarded): New function.
	* value-prof.c (gimple_ic_transform): Remove actual transform code.
	* ipa-inline-transform.c (speculation_removed): New global var.
	(clone_inlined_nodes): See if speculation can be removed.
	(inline_call): If speculations was removed, we growths may not match.
	* ipa-inline.c (can_inline_edge_p): Add DISREGARD_LIMITS parameter.
	(speculation_useful_p): New function.
	(resolve_noninline_speculation): New function.
	(inline_small_functions): Resolve useless speculations.
	* ipa-inline.h (speculation_useful_p): Declare
	* ipa.c (can_replace_by_local_alias): Simplify.
	(ipa_profile): Produce speculative calls in non-lto, too;
	add simple cost model; produce local aliases.

From-SVN: r201683
2013-08-13 12:21:16 +00:00
Eric Botcazou
537e035c48 utils2.c (build_atomic_load): Do a mere view-conversion to the original type before converting to the result type.
* gcc-interface/utils2.c (build_atomic_load): Do a mere view-conversion
	to the original type before converting to the result type.
	(build_atomic_store): First do a conversion to the original type before
	view-converting to the effective type, but deal with a padded type
	specially.

From-SVN: r201682
2013-08-13 10:26:40 +00:00
David Malcolm
3944d88d35 Example of converting global state to per-pass state.
gcc/testsuite

2013-08-13  David Malcolm  <dmalcolm@redhat.com>

	Example of converting global state to per-pass state.

	* gcc.dg/plugin/one_time_plugin.c (one_pass::execute): Convert
	global state "static int counter" to...
	(one_pass::counter): ...this instance data.

From-SVN: r201681
2013-08-13 00:45:27 +00:00
David Malcolm
b338b23f88 one_time_plugin.c: (one_pass_gate): Convert to member function...
gcc/testsuite

2013-08-13  David Malcolm  <dmalcolm@redhat.com>

	* gcc.dg/plugin/one_time_plugin.c: (one_pass_gate): Convert
	to member function...
	(one_pass::gate): ...this.
	(one_pass_exec): Convert to member function...
	(one_pass::impl_execute): ...this.

From-SVN: r201680
2013-08-13 00:41:39 +00:00
David Malcolm
f971dc24bf t-i386 (i386.o): Rename stray PIPELINE_H to PASS_MANAGER_H
2013-08-13  David Malcolm  <dmalcolm@redhat.com>

	* config/i386/t-i386 (i386.o): Rename stray PIPELINE_H to
	PASS_MANAGER_H

From-SVN: r201679
2013-08-13 00:29:39 +00:00
GCC Administrator
c08b4f1a14 Daily bump.
From-SVN: r201678
2013-08-13 00:16:31 +00:00
Adam Butcher
faca067013 * pt.c: Grammar fix in comments ("it's" to "its").
From-SVN: r201674
2013-08-13 00:26:18 +01:00
Adam Butcher
d445d18d37 * MAINTAINERS (Write After Approval): Add myself.
From-SVN: r201673
2013-08-13 00:26:09 +01:00
Paolo Carlini
97524ab728 re PR c++/57416 (internal compiler error: in gimple_expand_cfg, at cfgexpand.c:4575)
2013-08-12  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57416
	* g++.dg/cpp0x/pr57416.C: New.

From-SVN: r201672
2013-08-12 22:54:13 +00:00
Paolo Carlini
2e507b9a99 i386.c (ix86_function_versions): Use error + inform.
2013-08-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* config/i386/i386.c (ix86_function_versions): Use error + inform.

/cp
2013-08-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (warn_extern_redeclared_static, duplicate_decls,
	check_elaborated_type_specifier): Use error + inform.
	* friend.c (make_friend_class): Likewise.
	* semantics.c (finish_id_expression): Likewise.

/testsuite
2013-08-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/constexpr-function2.C: Adjust for error -> inform
	changes.
	* g++.dg/cpp0x/constexpr-neg1.C: Likewise.
	* g++.dg/cpp0x/defaulted2.C: Likewise.
	* g++.dg/cpp0x/defaulted31.C: Likewise.
	* g++.dg/cpp0x/error6.C: Likewise.
	* g++.dg/cpp0x/gen-attrs-32.C: Likewise.
	* g++.dg/cpp0x/override2.C: Likewise.
	* g++.dg/cpp0x/parse1.C: Likewise.
	* g++.dg/cpp0x/scoped_enum.C: Likewise.
	* g++.dg/cpp0x/temp_default4.C: Likewise.
	* g++.dg/ext/attrib32.C: Likewise.
	* g++.dg/ext/gnu-inline-global-reject.C: Likewise.
	* g++.dg/ext/mv13.C: Likewise.
	* g++.dg/ext/mv7.C: Likewise.
	* g++.dg/ext/mv9.C: Likewise.
	* g++.dg/ext/pr57362.C: Likewise.
	* g++.dg/ext/typeof10.C: Likewise.
	* g++.dg/lookup/anon6.C: Likewise.
	* g++.dg/lookup/crash6.C: Likewise.
	* g++.dg/lookup/name-clash5.C: Likewise.
	* g++.dg/lookup/name-clash6.C: Likewise.
	* g++.dg/other/anon4.C: Likewise.
	* g++.dg/other/error15.C: Likewise.
	* g++.dg/other/error8.C: Likewise.
	* g++.dg/other/redecl2.C: Likewise.
	* g++.dg/parse/crash16.C: Likewise.
	* g++.dg/parse/crash21.C: Likewise.
	* g++.dg/parse/crash38.C: Likewise.
	* g++.dg/parse/redef2.C: Likewise.
	* g++.dg/parse/struct-as-enum1.C: Likewise.
	* g++.dg/template/crash39.C: Likewise.
	* g++.dg/template/redecl3.C: Likewise.
	* g++.dg/tls/diag-3.C: Likewise.
	* g++.dg/warn/Wredundant-decls-spec.C: Likewise.
	* g++.old-deja/g++.benjamin/typedef01.C: Likewise.
	* g++.old-deja/g++.benjamin/warn02.C: Likewise.
	* g++.old-deja/g++.brendan/crash16.C: Likewise.
	* g++.old-deja/g++.brendan/crash18.C: Likewise.
	* g++.old-deja/g++.brendan/err-msg4.C: Likewise.
	* g++.old-deja/g++.brendan/redecl1.C: Likewise.
	* g++.old-deja/g++.brendan/static3.C: Likewise.
	* g++.old-deja/g++.bugs/900127_02.C: Likewise.
	* g++.old-deja/g++.jason/binding.C: Likewise.
	* g++.old-deja/g++.jason/crash4.C: Likewise.
	* g++.old-deja/g++.jason/crash7.C: Likewise.
	* g++.old-deja/g++.jason/lineno.C: Likewise.
	* g++.old-deja/g++.jason/scoping7.C: Likewise.
	* g++.old-deja/g++.mike/misc3.C: Likewise.
	* g++.old-deja/g++.mike/net44.C: Likewise.
	* g++.old-deja/g++.mike/ns3.C: Likewise.
	* g++.old-deja/g++.ns/alias4.C: Likewise.
	* g++.old-deja/g++.ns/ns11.C: Likewise.
	* g++.old-deja/g++.other/crash23.C: Likewise.
	* g++.old-deja/g++.other/decl8.C: Likewise.
	* g++.old-deja/g++.other/linkage3.C: Likewise.
	* g++.old-deja/g++.other/typeck1.C: Likewise.
	* g++.old-deja/g++.other/typedef5.C: Likewise.
	* g++.old-deja/g++.pt/explicit34.C: Likewise.
	* g++.old-deja/g++.pt/friend36.C: Likewise.
	* obj-c++.dg/method-8.mm: Likewise.
	* obj-c++.dg/tls/diag-3.mm: Likewise.

From-SVN: r201671
2013-08-12 22:37:20 +00:00
Caroline Tice
82ca21b50b Updating my information in MAINTAINERS.
From-SVN: r201669
2013-08-12 13:25:29 -07:00
Uros Bizjak
c97fd4b856 [multiple changes]
2013-08-12  Uros Bizjak  <ubizjak@gmail.com>

	* config/i386/i386.md (floatunssi<mode>2 expand): Use MODEF mode
	iterator instead of X87MODEF.

2013-08-12  Perez Read  <netfirewall@gmail.com>

	PR target/58132
	* config/i386/i386.md (*movabs<mode>_1):  Add <ptrsize> PTR before
	operand 0 for intel asm alternative.
	(*movabs<mode>_2): Ditto for operand 1.

testsuite/ChangeLog:

2013-08-12  Perez Read  <netfirewall@gmail.com>

         PR target/58132
         * gcc.target/i386/movabs-1.c: New test.

From-SVN: r201668
2013-08-12 19:23:43 +02:00
James Greenhalgh
f4f4204c89 [AArch64] Fix name of macros called in the vdup_lane Neon intrinsics
gcc/
	* config/aarch64/arm_none.h
	(vdup<bhsd>_lane_<su><8,16,32,64>): Fix macro call.

From-SVN: r201666
2013-08-12 15:59:34 +00:00
Nick Clifton
133b1a8e84 * config.gcc (m32r-linux): Allow for tmake_file not being empty.
From-SVN: r201664
2013-08-12 14:17:15 +00:00
Yuri Rumyantsev
15dd8b3a8c i386.md (floatunssi<mode>2 expand): Add new expand for QI/HImode operand to produce more effictive code for...
* config/i386/i386.md (floatunssi<mode>2 expand): Add new
        expand for QI/HImode operand to produce more effictive code for
        unsigned char(short) --> float(double) conversion.

From-SVN: r201663
2013-08-12 12:28:47 +00:00
Alexander Monakov
94109a6a3a * doc/invoke.texi: Mention that -ftls-model does not force the final model.
From-SVN: r201661
2013-08-12 13:40:28 +04:00
Marek Polacek
4e11510216 re PR tree-optimization/57980 (gcc 4.8.1 -foptimize-sibling-calls -O1 ICE in build_int_cst_wide, at tree.c:1210)
PR tree-optimization/57980

Co-Authored-By: Marc Glisse <marc.glisse@inria.fr>

From-SVN: r201660
2013-08-12 08:46:41 +00:00
Jan Hubicka
1f97e193cc Fix typo.
From-SVN: r201659
2013-08-12 07:16:19 +00:00
Thomas Koenig
0e533e5078 re PR fortran/56666 (Suppression flag for " DO loop at (1) will be executed zero times")
2013-08-12  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/56666
	* gfortran.h (gfc_option_t):  Add warn_zerotrip.
	* invoke.texi (-Wzerotrip):  Document option.
	* lang.opt (Wzerotrip):  Add.
	* options.c (gfc_init_options):  Initialize warn_zerotrip.
	(set_Wall): Add handling of warn_zerotrip.
	(gfc_handle_option):  Handle OPT_Wzerotrip.
	* resolve.c (gfc_resolve_iterator): Honor
	gfc_option.warn_zerotrip; update error message to show
	how to suppress the warning.

2013-08-12  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/56666
	* gfortran.dg/do_check_10.f90:  New test.
	* gfortran.dg/array_constructor_11.f90:  Add -Wzerotrip to dg-options.
	* gfortran.dg/array_constructor_18.f90:  Likewise.
	* gfortran.dg/array_constructor_22.f90:  Likewise.
	* gfortran.dg/coarray_15.f90:  Likewise.
	* gfortran.dg/do_1.f90:  Add -Wall to dg-options.
	* gfortran.dg/do_3.F90:  Add -Wzerotrip to dg-options.
	* gfortran.dg/do_check_5.f90:  Add -Wall to gd-options.

From-SVN: r201658
2013-08-12 05:50:03 +00:00
GCC Administrator
4fade8c2c3 Daily bump.
From-SVN: r201657
2013-08-12 00:17:00 +00:00
Paolo Carlini
0971a73391 re PR c++/53349 (Internal compiler error with constexpr and recursive data type)
2013-08-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/53349
	* g++.dg/cpp0x/constexpr-ice8.C: New.

From-SVN: r201654
2013-08-11 22:06:04 +00:00
GCC Administrator
de0b2c131f Daily bump.
From-SVN: r201651
2013-08-11 00:16:31 +00:00
Jan Hubicka
748d71f394 Workaround binutils PR14342
Workaround binutils PR14342
	* tree-profile.c (init_ic_make_global_vars): Add LTO path.
	(gimple_init_edge_profiler): Likewise.
	(gimple_gen_ic_func_profiler): Likewise.

	* Makefile.in: Add _gcov_indirect_call_profiler_v2 symbol.
	* libgcov.c (L_gcov_indirect_call_profiler): Restore original API.
	(L_gcov_indirect_call_profiler_v2): New.

From-SVN: r201648
2013-08-10 20:52:06 +00:00
Jan Hubicka
5979aa5497 * cgraph.c (cgraph_create_edge_1): Clear speculative flag.
From-SVN: r201646
2013-08-10 09:59:56 +00:00
Xinliang David Li
ad83025ea6 Implement -mmemcpy-strategy= and -mmemset-strategy= options
From-SVN: r201645
2013-08-10 03:48:01 +00:00