Commit Graph

128402 Commits

Author SHA1 Message Date
Paul Thomas 68b1c5e1f2 re PR fortran/57522 ([F03] ASSOCIATE construct creates array descriptor with incorrect stride for derived type array component)
2014-02-09  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/57522
	* resolve.c (resolve_assoc_var): Set the subref_array_pointer
	attribute for the 'associate-name' if necessary.
	* trans-stmt.c (trans_associate_var): If the 'associate-name'
	is a subref_array_pointer, assign the element size of the
	associate variable to 'span'.

2014-02-09  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/57522
	* gfortran.dg/associated_target_5.f03 : New test

From-SVN: r207646
2014-02-09 20:50:21 +00:00
Paul Thomas 56c78e5c22 re PR fortran/59026 (ELEMENTAL procedure with VALUE arguments emits wrong code)
2014-02-09  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/59026
	* trans-expr.c (gfc_conv_procedure_call): Pass the value of the
	actual argument to a formal argument with the value attribute
	in an elemental procedure.

2014-02-09  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/59026
	* gfortran.dg/elemental_by_value_1.f90 : New test

From-SVN: r207645
2014-02-09 19:45:06 +00:00
Richard Sandiford 5a47e4c519 baseline_symbols.txt: New file.
libstdc++-v3/
	* config/abi/post/mips64-linux-gnu/32/baseline_symbols.txt: New file.
	* config/abi/post/mips64-linux-gnu/baseline_symbols.txt: Update.
	* config/abi/post/mips64-linux-gnu/64/baseline_symbols.txt: Likewise.

From-SVN: r207643
2014-02-09 14:19:13 +00:00
GCC Administrator fcd4d5537a Daily bump.
From-SVN: r207641
2014-02-09 00:16:51 +00:00
Janus Weil a6cd299b54 re PR fortran/58470 ([OOP] ICE on invalid with FINAL procedure and type extension)
2014-02-08  Janus Weil  <janus@gcc.gnu.org>
	    Mikael Morin <mikael.morin@gcc.gnu.org>

	PR fortran/58470
	* class.c (generate_finalization_wrapper): Assert that proc_tree has
	been set in gfc_resolve_finalizers.
	* resolve.c (resolve_fl_derived0): Remove unnecessary call to
	gfc_is_finalizable.


2014-02-08  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/58470
	* gfortran.dg/finalize_22.f90: New.

Co-Authored-By: Mikael Morin <mikael@gcc.gnu.org>

From-SVN: r207636
2014-02-08 22:32:25 +01:00
Paul Thomas df3927406e re PR fortran/60066 (Bad elemental invocation of non-scalar base object)
2014-02-08  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/60066
	* gfortran.dg/elemental_subroutine_10.f90 : New test. This PR
	was fixed by the patch for PR59906.

From-SVN: r207633
2014-02-08 16:22:46 +00:00
Jakub Jelinek 41475e966c tree-vect-data-refs.c (vect_analyze_data_refs): For clobbers not at the end of datarefs vector use ordered_remove to avoid...
* tree-vect-data-refs.c (vect_analyze_data_refs): For clobbers
	not at the end of datarefs vector use ordered_remove to avoid
	reordering datarefs vector.

From-SVN: r207632
2014-02-08 15:52:39 +01:00
Andreas Schwab 80a16a87b6 re PR translation/52289 (translatable string typo: "must not be have")
PR translation/52289
* gfortran.dg/coarray_8.f90: Update dg-error match.

From-SVN: r207630
2014-02-08 09:33:24 +00:00
Jakub Jelinek c74559df76 re PR c/59984 (OpenMP pragma makes loop incorrect)
PR c/59984
	* gimplify.c (gimplify_bind_expr): In ORT_SIMD region
	mark local addressable non-static vars as GOVD_PRIVATE
	instead of GOVD_LOCAL.
	* omp-low.c (lower_omp_for): Move gimple_bind_vars
	and BLOCK_VARS of gimple_bind_block to new_stmt rather
	than copying them.

	* gcc.dg/vect/pr59984.c: New test.

From-SVN: r207629
2014-02-08 10:10:14 +01:00
Jakub Jelinek 8fcbce729d re PR middle-end/60092 (posix_memalign not recognized to derive alias and alignment info)
PR middle-end/60092
	* tree-ssa-ccp.c (surely_varying_stmt_p): Don't return true
	if TYPE_ATTRIBUTES (gimple_call_fntype ()) contain
	assume_aligned or alloc_align attributes.
	(bit_value_assume_aligned): Add ATTR, PTRVAL and ALLOC_ALIGN
	arguments.  Handle also assume_aligned and alloc_align attributes.
	(evaluate_stmt): Adjust bit_value_assume_aligned caller.
	Handle calls to functions with assume_aligned or alloc_align
	attributes.
	* doc/extend.texi: Document assume_aligned and alloc_align
	attributes.
c-family/
	* c-common.c (handle_alloc_size_attribute): Use tree_fits_uhwi_p
	and tree_to_uhwi.
	(handle_alloc_align_attribute, handle_assume_aligned_attribute): New
	functions.
	(c_common_attribute_table): Add alloc_align and assume_aligned
	attributes.
testsuite/
	* gcc.dg/attr-alloc_align-1.c: New test.
	* gcc.dg/attr-alloc_align-2.c: New test.
	* gcc.dg/attr-alloc_align-3.c: New test.
	* gcc.dg/attr-assume_aligned-1.c: New test.
	* gcc.dg/attr-assume_aligned-2.c: New test.
	* gcc.dg/attr-assume_aligned-3.c: New test.

From-SVN: r207628
2014-02-08 10:09:01 +01:00
Terry Guo 451bdd2308 invoke.texi: Document ARM -march=armv7e-m.
2014-02-08  Terry Guo  <terry.guo@arm.com>

	* doc/invoke.texi: Document ARM -march=armv7e-m.

From-SVN: r207627
2014-02-08 01:33:54 +00:00
GCC Administrator ca7393ca5c Daily bump.
From-SVN: r207626
2014-02-08 00:16:41 +00:00
Jakub Jelinek d71dfeb743 cilk-common.c (cilk_init_builtins): Clear TREE_NOTHROW flag on __cilkrts_rethrow builtin.
* cilk-common.c (cilk_init_builtins): Clear TREE_NOTHROW
	flag on __cilkrts_rethrow builtin.

From-SVN: r207623
2014-02-08 00:58:29 +01:00
Jakub Jelinek 8bb346eb0d re PR target/60077 (gcc.target/i386/pr35767-5.c FAILs)
PR target/60077
	* gcc.target/i386/pr60077-1.c: New test.
	* gcc.target/i386/pr60077-2.c: New test.

From-SVN: r207622
2014-02-08 00:55:24 +01:00
Jakub Jelinek d31d42c74d re PR ipa/60026 (ICE at -O3 on valid code (with the optimize pragma) on x86_64-linux-gnu)
PR ipa/60026
	* ipa-cp.c (determine_versionability): Fail at -O0
	or __attribute__((optimize (0))) or -fno-ipa-cp functions.
	* tree-sra.c (ipa_sra_preliminary_function_checks): Similarly.

	Revert:
	2014-02-04  Jakub Jelinek  <jakub@redhat.com>

	PR ipa/60026
	* tree-inline.c (copy_forbidden): Fail for
	__attribute__((optimize (0))) functions.

From-SVN: r207621
2014-02-08 00:54:17 +01:00
Jan Hubicka a0a98fef26 varpool.c: Include pointer-set.h.
* varpool.c: Include pointer-set.h.
	(varpool_remove_unreferenced_decls): Variables in other partitions
	will not be output; be however careful to not lose information
	about partitioning.

From-SVN: r207620
2014-02-07 23:49:18 +00:00
Jan Hubicka b7e85694cf * lto.c (unify_scc): Free CONSTRUCTOR_ELTS.
From-SVN: r207619
2014-02-07 23:47:17 +00:00
Jan Hubicka 8c311b50d1 gimple-fold.c (gimple_get_virt_method_for_vtable): Do O(1) lookup in the vtable constructor.
* gimple-fold.c (gimple_get_virt_method_for_vtable): Do O(1)
	lookup in the vtable constructor.

From-SVN: r207616
2014-02-07 23:26:39 +00:00
Jeff Law 63e6247dfe re PR target/40977 (problem with code like this: res = ((uint64_t)resh << 32) | resl;)
PR target/40977
	* config/m68k/m68k.md (ashldi_extsi): Turn into a
	define_insn_and_split.

From-SVN: r207615
2014-02-07 15:35:49 -07:00
Prathamesh Kulkarni b581c05cd9 c-parser.c (c_parser_get_builtin_args): Replace calls to C_EXPR_APPEND by vec_safe_push.
* c-parser.c (c_parser_get_builtin_args): Replace calls to
	C_EXPR_APPEND by vec_safe_push.
	* c-tree.h (C_EXPR_APPEND): Remove.

From-SVN: r207614
2014-02-07 22:09:01 +00:00
Misty De Meo 63fefb4bc9 re PR libgcc/58710 (HAVE_GETIPINFO is incorrectly set on Mac OS X 10.4)
PR target/58710
	* configure.ac: Use AC_LINK_IFELSE in check for
	_Unwind_GetIPInfo.
	* configure: Regenerate.

From-SVN: r207612
2014-02-07 21:10:55 +00:00
Benno Schulenberg 6726b9071c re PR translation/52289 (translatable string typo: "must not be have")
PR translation/52289
        * fortran/resolve.c (resolve_ordinary_assign): Fix typoed word
        in an error message.

From-SVN: r207609
2014-02-07 10:52:59 -07:00
Jeff Law 7ba03e5e3f * ipa-inline.c (inline_small_functions): Fix typos.
From-SVN: r207608
2014-02-07 10:29:26 -07:00
Jakub Jelinek acf601aefd re PR preprocessor/56824 (pragma GCC diagnostic push/pop fail with GCC diagnostic ignored "-Waggregate-return")
PR preprocessor/56824
	* line-map.c (get_combined_adhoc_loc, linemap_get_expansion_line,
	linemap_get_expansion_filename, linemap_location_in_system_header_p,
	linemap_location_from_macro_expansion_p,
	linemap_macro_loc_to_spelling_point, linemap_macro_loc_to_def_point,
	linemap_macro_loc_to_exp_point, linemap_expand_location): Fix
	formatting.
	(linemap_compare_locations): Look through adhoc locations for both
	l0 and l1.

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

From-SVN: r207606
2014-02-07 17:42:24 +01:00
Richard Sandiford 177bc204a2 gcc/
* config/s390/s390-protos.h (s390_can_use_simple_return_insn)
	(s390_can_use_return_insn): Declare.
	* config/s390/s390.h (EPILOGUE_USES): Define.
	* config/s390/s390.c (s390_mainpool_start): Allow two main_pool
	instructions.
	(s390_chunkify_start): Handle return JUMP_LABELs.
	(s390_early_mach): Emit a main_pool instruction on the entry edge.
	(s300_set_up_by_prologue, s390_can_use_simple_return_insn)
	(s390_can_use_return_insn): New functions.
	(s390_fix_long_loop_prediction): Handle conditional returns.
	(TARGET_SET_UP_BY_PROLOGUE): Define.
	* config/s390/s390.md (ANY_RETURN): New code iterator.
	(*creturn, *csimple_return, return, simple_return): New patterns.

From-SVN: r207605
2014-02-07 14:52:26 +00:00
Richard Sandiford 0621cf3c78 s390.c (s390_restore_gprs_from_fprs): Add REG_CFA_RESTORE notes to each restore.
gcc/
	* config/s390/s390.c (s390_restore_gprs_from_fprs): Add REG_CFA_RESTORE
	notes to each restore.  Also add REG_CFA_DEF_CFA when restoring %r15.
	(s390_optimize_prologue): Don't clear RTX_FRAME_RELATED_P.  Update the
	REG_CFA_RESTORE list when deciding not to restore a register.

From-SVN: r207604
2014-02-07 14:52:13 +00:00
Richard Sandiford 4099494d5e s390.c: Include tree-pass.h and context.h.
gcc/
	* config/s390/s390.c: Include tree-pass.h and context.h.
	(s390_early_mach): New function, split out from...
	(s390_emit_prologue): ...here.
	(pass_data_s390_early_mach): New pass structure.
	(pass_s390_early_mach): New class.
	(s390_option_override): Create and register early_mach pass.
	Move to end of file.

From-SVN: r207603
2014-02-07 14:50:19 +00:00
Richard Sandiford 3489cc3363 var-tracking.c (vt_stack_adjustments): Don't require stack_adjusts to match for the exit block.
gcc/
	* var-tracking.c (vt_stack_adjustments): Don't require stack_adjusts
	to match for the exit block.

From-SVN: r207602
2014-02-07 14:49:12 +00:00
Andreas Krebbel 75cc21e2b7 2014-02-07 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* config/s390/s390.md ("atomic_load<mode>", "atomic_store<mode>")
	("atomic_compare_and_swap<mode>", "atomic_fetch_<atomic><mode>"):
	Reject misaligned operands.

From-SVN: r207601
2014-02-07 14:22:41 +00:00
Andreas Krebbel f4b83d6659 gcc-have-sync-compare-and-swap.c: Align the 16 byte variable used for atomic operations.
2014-02-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* gcc.dg/gcc-have-sync-compare-and-swap.c: Align the 16 byte
	variable used for atomic operations.

From-SVN: r207600
2014-02-07 14:21:29 +00:00
Andreas Krebbel 8bd7070a7a optabs.c (expand_atomic_compare_and_swap): Allow expander to fail.
2014-02-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* optabs.c (expand_atomic_compare_and_swap): Allow expander to
	fail.

From-SVN: r207599
2014-02-07 14:20:17 +00:00
Richard Biener 831806cb21 re PR middle-end/60092 (posix_memalign not recognized to derive alias and alignment info)
2014-02-07  Richard Biener  <rguenther@suse.de>

	PR middle-end/60092
	* gimple-low.c (lower_builtin_posix_memalign): New function.
	(lower_stmt): Call it to lower posix_memalign in a way
	to make alignment info accessible.

	* gcc.dg/vect/pr60092-2.c: New testcase.

From-SVN: r207598
2014-02-07 13:41:10 +00:00
Jakub Jelinek 7ee9c16fa8 re PR c++/60082 (Certain Cilk keywords executable Hanging for -O1)
PR c++/60082
	* tree.c (build_common_builtin_nodes): Set ECF_LEAF for
	__builtin_setjmp_receiver.

	Revert
	2014-02-05  Balaji V. Iyer  <balaji.v.iyer@intel.com>

	* g++.dg/cilk-plus/CK/catch_exc.cc: Disable test for -O1.
	* c-c++-common/cilk-plus/CK/spawner_inline.c: Likewise.

From-SVN: r207597
2014-02-07 11:49:08 +01:00
Andreas Krebbel ce245ec69e _fixdfdi.c: Throw invalid exception if number cannot be represented.
2014-02-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* config/s390/32/_fixdfdi.c: Throw invalid exception if number
	cannot be represented.
	* config/s390/32/_fixsfdi.c: Likewise.
	* config/s390/32/_fixtfdi.c: Likewise.
	* config/s390/32/_fixunsdfdi.c: Likewise.
	* config/s390/32/_fixunssfdi.c: Likewise.
	* config/s390/32/_fixunstfdi.c: Likewise.

2014-02-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* gcc.target/s390/fp2int1.c: New testcase.

From-SVN: r207596
2014-02-07 10:14:24 +00:00
Richard Biener 32cab212f2 re PR middle-end/60092 (posix_memalign not recognized to derive alias and alignment info)
2014-02-07  Richard Biener  <rguenther@suse.de>

	PR middle-end/60092
	* builtin-types.def (BT_FN_INT_PTRPTR_SIZE_SIZE): Add.
	* builtins.def (BUILT_IN_POSIX_MEMALIGN): Likewise.
	* tree-ssa-structalias.c (find_func_aliases_for_builtin_call):
	Handle BUILT_IN_POSIX_MEMALIGN.
	(find_func_clobbers): Likewise.
	* tree-ssa-alias.c (ref_maybe_used_by_call_p_1): Likewise.
	(call_may_clobber_ref_p_1): Likewise.

	* gcc.dg/tree-ssa/alias-30.c: New testcase.
	* gcc.dg/tree-ssa/alias-31.c: Likewise.

From-SVN: r207595
2014-02-07 09:33:23 +00:00
Richard Sandiford 1c51d6883a configure.ac (libgcc_cv_mips_hard_float): New.
libgcc/
	* configure.ac (libgcc_cv_mips_hard_float): New.
	* configure: Regenerate.
	* config.host (mips*-*-*): Use t-hardfp-sfdf rather than
	t-softfp-sfdf for hard-float targets.
	* config/mips/t-mips (LIB2_SIDITI_CONV_FUNCS): Reinstate.
	(softfp_float_modes, softfp_int_modes, softfp_extensions)
	(softfp_truncations, softfp_exclude_libgcc2): New.
	* config/t-hardfp: New file.
	* config/t-hardfp-sfdf: Likewise.
	* config/hardfp.c: Likewise.

From-SVN: r207593
2014-02-07 07:46:34 +00:00
Jan Hubicka 6d6af79282 re PR ipa/59918 (ICE in record_target_from_binfo, at ipa-devirt.c:693)
PR ipa/59918
	* ipa-devirt.c (record_target_from_binfo): Remove overactive sanity check.
	* g++.dg/torture/pr59918.C: New testcase.

From-SVN: r207592
2014-02-07 06:01:36 +00:00
Jan Hubicka ddb3e20aae re PR ipa/59469 (LLVM build failure with gcc LTO)
PR ipa/59469
	* lto-cgraph.c (lto_output_node): Use
	symtab_get_symbol_partitioning_class.
	(lto_output_varpool_node): likewise.
	(symtab_get_symbol_partitioning_class): Move here from
	lto/lto-partition.c
	* cgraph.h (symbol_partitioning_class): Likewise.
	(symtab_get_symbol_partitioning_class): Declare.

From-SVN: r207591
2014-02-07 02:28:33 +00:00
Jan Hubicka 3c0f1105e1 re PR ipa/59469 (LLVM build failure with gcc LTO)
PR ipa/59469
	* lto-cgraph.c (lto_output_node): Use
	symtab_get_symbol_partitioning_class.
	(lto_output_varpool_node): likewise.
	(symtab_get_symbol_partitioning_class): Move here from
	lto/lto-partition.c
	* cgraph.h (symbol_partitioning_class): Likewise.
	(symtab_get_symbol_partitioning_class): Declare.

From-SVN: r207590
2014-02-07 02:27:37 +00:00
Jan Hubicka 964512791e re PR ipa/59469 (LLVM build failure with gcc LTO)
PR ipa/59469
	* lto-cgraph.c (lto_output_node): Use
	symtab_get_symbol_partitioning_class.
	(lto_output_varpool_node): likewise.
	(symtab_get_symbol_partitioning_class): Move here from
	lto/lto-partition.c
	* cgraph.h (symbol_partitioning_class): Likewise.
	(symtab_get_symbol_partitioning_class): Declare.

	* lto-partition.c (symbol_class): Move to cgraph.h
	(get_symbol_class): Move to symtab.c
	(add_references_to_partition, add_symbol_to_partition_1,
	lto_max_map, lto_1_to_1_map, lto_balanced_map,
	lto_promote_cross_file_statics): Update.

From-SVN: r207589
2014-02-07 02:27:05 +00:00
Jan Hubicka b3bb0eb9c0 parser.c (synthesize_implicit_template_parm): Use grow_tree_vec.
* parser.c (synthesize_implicit_template_parm): Use grow_tree_vec.
	* ggc.h (ggc_internal_cleared_alloc): New macro.
	* vec.h (vec_safe_copy): Handle memory stats.
	* omp-low.c (simd_clone_struct_alloc): Use ggc_internal_cleared_alloc.
	* target-globals.c (save_target_globals): Likewise.

From-SVN: r207588
2014-02-07 02:14:58 +00:00
Jakub Jelinek e2f0f5f704 re PR target/60077 (gcc.target/i386/pr35767-5.c FAILs)
PR target/60077
	* expr.c (emit_move_resolve_push): Export; be bit more selective
	on when to clear alias set.
	* expr.h (emit_move_resolve_push): Declare.
	* function.h (struct function): Add tail_call_marked.
	* tree-tailcall.c (optimize_tail_call): Set tail_call_marked.
	* config/i386/i386-protos.h (ix86_expand_push): Remove.
	* config/i386/i386.md (TImode move expander): De not call
	ix86_expand_push.
	(FP push expanders): Preserve memory attributes.
	* config/i386/sse.md (push<mode>1): Remove.
	* config/i386/i386.c (ix86_expand_vector_move): Handle push
	operation.
	(ix86_expand_push): Remove.
	* config/i386/mmx.md (push<mode>1): Remove.

From-SVN: r207587
2014-02-07 02:11:27 +00:00
GCC Administrator 44afe5e47b Daily bump.
From-SVN: r207586
2014-02-07 00:16:57 +00:00
Jakub Jelinek 47d552eb01 re PR rtl-optimization/60030 (ICE in simplify_subreg, at simplify-rtx.c:5903)
PR rtl-optimization/60030
	* internal-fn.c (ubsan_expand_si_overflow_mul_check): Surround
	lopart with paradoxical subreg before shifting it up by hprec.

From-SVN: r207582
2014-02-06 22:54:21 +01:00
Kyrylo Tkachov 45c75ea7f1 [ARM] Cortex-A57 rtx costs
* config/arm/aarch-cost-tables.h (cortexa57_extra_costs): New table.
	Remove extra newline at end of file.
	* config/arm/arm.c (arm_cortex_a57_tune): New tuning struct.
	(arm_issue_rate): Handle cortexa57.
	* config/arm/arm-cores.def (cortex-a57): Use cortex_a57 tuning.
	(cortex-a57.cortex-a53): Likewise.

From-SVN: r207565
2014-02-06 16:51:03 +00:00
Jakub Jelinek 69fe2dfb01 re PR debug/59575 (ICE in maybe_record_trace_start, at dwarf2cfi.c:2239)
PR target/59575
	* config/arm/arm.c (emit_multi_reg_push): Add dwarf_regs_mask argument,
	don't record in REG_FRAME_RELATED_EXPR registers not set in that
	bitmask.
	(arm_expand_prologue): Adjust all callers.
	(arm_unwind_emit_sequence): Allow saved, but not important for unwind
	info, registers also at the lowest numbered registers side.  Use
	gcc_assert instead of abort, and SET_SRC/SET_DEST macros instead of
	XEXP.

	* gcc.target/arm/pr59575.c: New test.

From-SVN: r207564
2014-02-06 16:52:36 +01:00
Jakub Jelinek 652a3e3ac3 re PR debug/59575 (ICE in maybe_record_trace_start, at dwarf2cfi.c:2239)
PR target/59575
	* config/arm/arm.c (emit_multi_reg_push): Add dwarf_regs_mask argument,
	don't record in REG_FRAME_RELATED_EXPR registers not set in that
	bitmask.
	(arm_expand_prologue): Adjust all callers.
	(arm_unwind_emit_sequence): Allow saved, but not important for unwind
	info, registers also at the lowest numbered registers side.  Use
	gcc_assert instead of abort, and SET_SRC/SET_DEST macros instead of
	XEXP.

	* gcc.target/arm/pr59575.c: New test.

From-SVN: r207563
2014-02-06 16:52:17 +01:00
Jakub Jelinek af116cae67 re PR debug/59992 (Compilation of insn-recog.c too slow due to var-tracking)
PR debug/59992
	* var-tracking.c (adjust_mems): Before adding a SET
	to amd->side_effects, adjust it's SET_SRC using
	simplify_replace_fn_rtx.

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

From-SVN: r207562
2014-02-06 16:47:12 +01:00
Marc Glisse 0f5e5e02b7 constexpr-attribute2.C: Restrict to target init_priority.
2014-02-06  Marc Glisse  <marc.glisse@inria.fr>

	* g++.dg/cpp0x/constexpr-attribute2.C: Restrict to target
	init_priority. Test alignment of variable instead of function.

From-SVN: r207561
2014-02-06 15:32:27 +00:00
Arnaud Charlet f29afe5f14 Code clean ups.
From-SVN: r207560
2014-02-06 15:16:52 +01:00