platform/upstream/gcc.git
19 years agoc-decl.c (push_scope): Remove "\n" from end of diagnostic for too many nested scopes.
Joseph Myers [Fri, 19 Nov 2004 19:54:39 +0000 (19:54 +0000)]
c-decl.c (push_scope): Remove "\n" from end of diagnostic for too many nested scopes.

* c-decl.c (push_scope): Remove "\n" from end of diagnostic for
too many nested scopes.

From-SVN: r90936

19 years agore PR tree-optimization/18181 (vectorizer: problem in the peeling mechanism in the...
Dorit Naishlos [Fri, 19 Nov 2004 19:39:40 +0000 (19:39 +0000)]
re PR tree-optimization/18181 (vectorizer: problem in the peeling mechanism in the presence of loop invariants that are used after the loop)

        PR tree-opt/18181
        * tree-vectorizer.c (slpeel_tree_peel_loop_to_edge): Peeling scheme
        changed to suppoer uses-after-loop and to void creating flow paths
        that shouldn't exist.
        (slpeel_update_phi_nodes_for_guard): Takes additional two arguments.
        Modified to fit the new peeling scheme. Avoid quadratic behavior.
        (slpeel_add_loop_guard): Takes additional argument.
        (slpeel_verify_cfg_after_peeling): New function.
        (vect_update_ivs_after_vectorizer): Takes additional argument. Updated
        documentation. Use 'exit-bb' instead of creating 'new-bb'.
        (rename_variables_in_bb): Don't update phis for BBs out of loop, to fit
        the new peeling scheme.
        (copy_phi_nodes): Function removed. Its functionality moved to
        update_phis_for_duplicate_loop.
        (slpeel_update_phis_for_duplicate_loop): Functionality of copy_phi_nodes
        moved here. Added documentation. Modified to fit the new peeling scheme.
        (slpeel_make_loop_iterate_ntimes): Setting loop->single_exit not not
        needed - done in slpeel_tree_peel_loop_to_edge.
        (slpeel_tree_duplicate_loop_to_edge_cfg): Debug printouts compacted.
        (vect_do_peeling_for_loop_bound): Add documentation. Call
        slpeel_verify_cfg_after_peeling. Call vect_update_ivs_after_vectorizer
        with additional argument.
        (vect_do_peeling_for_alignment): Call slpeel_verify_cfg_after_peeling.

        (vect_finish_stmt_generation): Avoid 80 column oveflow.

From-SVN: r90932

19 years agotree-vectorizer.c (slpeel_make_loop_iterate_ntimes): Last two arguments removed.
Dorit Naishlos [Fri, 19 Nov 2004 19:08:03 +0000 (19:08 +0000)]
tree-vectorizer.c (slpeel_make_loop_iterate_ntimes): Last two arguments removed.

        * tree-vectorizer.c (slpeel_make_loop_iterate_ntimes): Last two
        arguments removed.
        (slpeel_tree_peel_loop_to_edge): Call slpeel_make_loop_iterate_ntimes
        without last two arguments. Update single_exit of loops.
        (vect_update_niters_after_peeling): Removed. Its functionality was
        moved to vect_do_peeling_for_alignment.
        (vect_do_peeling_for_loop_bound): New name for function previously
        called vect_transform_for_unknown_loop_bound.
        (vect_transform_loop_bound): Call slpeel_make_loop_iterate_ntimes
        instead of code that duplicates the same functionality.
        (vect_do_peeling_for_alignment): Functionality of
        vect_update_niters_after_peeling moved here.
        (vect_transform_loop): Unify call to vect_do_peeling_for_loop_bound -
        previously named vect_transform_for_unknown_loop_bound - for both known
        and unknown loop bound cases.

From-SVN: r90931

19 years agotree-vectorizer.c (slpeel_can_duplicate_loop_p): New name for function previously...
Dorit Naishlos [Fri, 19 Nov 2004 19:03:56 +0000 (19:03 +0000)]
tree-vectorizer.c (slpeel_can_duplicate_loop_p): New name for function previously called verify_loop_for_duplication.

        * tree-vectorizer.c (slpeel_can_duplicate_loop_p): New name for function
        previously called verify_loop_for_duplication. All conditions compacted
        into one compound condition. Removed debug dumps.
        (vect_analyze_loop_with_symbolic_num_of_iters): Removed. Some of the
        functionality moved to vect_can_advance_ivs_p, and some to
        vect_analyze_loop_form.
        (vect_can_advance_ivs_p): New function. Contains functionality that was
        taken out of vect_analyze_loop_with_symbolic_num_of_iters.
        (slpeel_tree_peel_loop_to_edge): Call slpeel_can_duplicate_loop_p.
        (vect_analyze_operations): Call vect_can_advance_ivs_p and
        slpeel_can_duplicate_loop_p.
        (vect_get_loop_niters): Added documentation.
        (vect_analyze_loop_form): Check the loop entry always - not only in case
        of unknown loop bound. Create preheader and exit bb if necessary. Apply
        a check that used to take place in
        vect_analyze_loop_with_symbolic_num_of_iters.
        (vectorize_loops): Call verify_loop_closed_ssa under ENABLE_CHECKING.
        Remove redundant call to rewrite_into_loop_closed_ssa.
        (vect_compute_data_refs_alignment): Removed obsolete comment.

From-SVN: r90930

19 years agotree-vectorizer.c (slpeel_tree_peel_loop_to_edge): New name for function previously...
Dorit Naishlos [Fri, 19 Nov 2004 18:58:55 +0000 (18:58 +0000)]
tree-vectorizer.c (slpeel_tree_peel_loop_to_edge): New name for function previously called tree_duplicate_loop_to_edge.

        * tree-vectorizer.c (slpeel_tree_peel_loop_to_edge): New name for
        function previously called tree_duplicate_loop_to_edge.
        (slpeel_tree_duplicate_loop_to_edge_cfg): New name for function
        previously called tree_duplicate_loop_to_edge_cfg.
        (slpeel_update_phis_for_duplicate_loop): Prefix 'slpeel' added to
        function name.
        (slpeel_update_phi_nodes_for_guard): Likewise.
        (slpeel_make_loop_iterate_ntimes): Likewise.
        (slpeel_add_loop_guard): Likewise.
        (allocate_new_names, free_new_names): Function declaration moved to top
        of file.
        (rename_use_op, rename_def_op): Likewise.
        (rename_variables_in_bb, rename_variables_in_loop): Likewise.
        (vect_generate_tmps_on_preheader): Function declaration moved.
        (vect_transform_for_unknown_loop_bound): Added missing function
        declaration.

From-SVN: r90929

19 years agotree2 to tree_on_heap, I had forgot to update the change log :(.
Andrew Pinski [Fri, 19 Nov 2004 18:24:21 +0000 (10:24 -0800)]
tree2 to tree_on_heap, I had forgot to update the change log :(.

From-SVN: r90927

19 years agore PR tree-optimization/18507 (block_defs_stack varrray should not be GC'ed)
Andrew Pinski [Fri, 19 Nov 2004 18:21:44 +0000 (10:21 -0800)]
re PR tree-optimization/18507 (block_defs_stack varrray should not be GC'ed)

2004-11-19  Andrew Pinski  <pinskia@physics.uc.edu>

        PR tree-opt/18507
        * tree-flow.h (tree2): Typedef because there is already a VEC(tree).
        Define a VEC(tree2) for head.
        (register_new_def): Change second argument to be a VEC(tree2).
        * tree-ssa-dom.c (block_defs_stack): Change to be a VEC(tree2).
        (tree_ssa_dominator_optimize): Initialize block_defs_stack with
        the VEC(tree2) function.  Also free it before returning.
        (dom_opt_initialize_block): Use VEC_safe_push instead of VARRAY_PUSH_TREE
        for block_defs_stack.
        (restore_currdefs_to_original_value): Use VEC_length instead of
        VARRAY_ACTIVE_SIZE. VEC_pop instead of VARRAY_TOP_TREE/VARRAY_POP.
        (dom_opt_finalize_block): Use VEC_safe_push instead of VARRAY_PUSH_TREE
        for block_defs_stack.
        * tree-into-ssa.c (block_defs_stack): Change to be a VEC(tree2).
        (rewrite_initialize_block): Use VEC_safe_push instead of VARRAY_PUSH_TREE
        for block_defs_stack.
        (ssa_register_new_def): Likewise.
        (ssa_rewrite_initialize_block): Likewise.
        (rewrite_finalize_block): Use VEC_length instead of
        VARRAY_ACTIVE_SIZE. VEC_pop instead of VARRAY_TOP_TREE/VARRAY_POP.
        (ssa_rewrite_finalize_block): Likewise.
        (register_new_def): Change second argument to be a VEC(tree2).
        Use VEC_safe_push instead of VARRAY_PUSH_TREE.
        (rewrite_blocks): Initialize block_defs_stack with
        the VEC(tree2) function.  Also free it before returning.
        (rewrite_ssa_into_ssa): Likewise.

From-SVN: r90926

19 years agoNo darwin non-lazy-ptr for address calculatation when not needed.
Fariborz Jahanian [Fri, 19 Nov 2004 18:01:54 +0000 (18:01 +0000)]
No darwin non-lazy-ptr for address calculatation when not needed.

OKed by Geoff Keating.

From-SVN: r90925

19 years agotree-ssa.c (verify_ssa): Remove redundant checking of PHI arguments.
Jeff Law [Fri, 19 Nov 2004 16:56:14 +0000 (09:56 -0700)]
tree-ssa.c (verify_ssa): Remove redundant checking of PHI arguments.

        * tree-ssa.c (verify_ssa): Remove redundant checking of PHI
        arguments.

From-SVN: r90924

19 years agoMakefile.am (doxygen, [...]): Remove extra '$' from host_alias variable.
Jonathan Wakely [Fri, 19 Nov 2004 14:10:58 +0000 (14:10 +0000)]
Makefile.am (doxygen, [...]): Remove extra '$' from host_alias variable.

2004-11-19  Jonathan Wakely  <redi@gcc.gnu.org>

* Makefile.am (doxygen, doxygen-maint, doxygen-man): Remove extra '$'
from host_alias variable.
* Makefile.in: Regenerate.

From-SVN: r90919

19 years agore PR target/17735 (make stops with "initializer for integer value is too complicated...
Paul Brook [Fri, 19 Nov 2004 13:12:38 +0000 (13:12 +0000)]
re PR target/17735 (make stops with "initializer for integer value is too complicated" while building an avr-cross compiler)

PR target/17735
* varasm.c (default_assemble_integer): Allow pointer-sized values.
Expand comment.

From-SVN: r90918

19 years ago[multiple changes]
Paolo Carlini [Fri, 19 Nov 2004 12:44:09 +0000 (12:44 +0000)]
[multiple changes]

2004-11-19  Chris Jefferson  <chris@bubblescope.net>

* include/bits/stl_list.h (list::back, list::back const):
Don't decrement temporary.

2004-11-19  Paolo Carlini  <pcarlini@suse.de>

* include/bits/stl_deque.h (deque::front, deque::front const,
deque::back, deque::back const): Slightly tweak for stylistic
consistency.

From-SVN: r90917

19 years agoResync.
Arnaud Charlet [Fri, 19 Nov 2004 11:30:01 +0000 (12:30 +0100)]
Resync.

From-SVN: r90916

19 years agognat_ugn.texi: Remove extra paren check from list of checks for redundant constructs...
Arnaud Charlet [Fri, 19 Nov 2004 11:26:07 +0000 (12:26 +0100)]
gnat_ugn.texi: Remove extra paren check from list of checks for redundant constructs Add...

* gnat_ugn.texi:
Remove extra paren check from list of checks for redundant constructs
Add documentation of new -gnatyx style check (check extra parens)
Remove paragraph about gnatelim debug options.

* gnat_rm.texi: Document that Ada.Streams now forbids creating stream
objects rather than forbidding dependencies on the package Ada.Streams.

* sinfo.ads: Add ??? note that we should document pragmas passed to
back end.

* g-expect.ads: Fix a few typos in the comments.

From-SVN: r90915

19 years agomakegpr.adb (Compile): Put the compiling switches (in package Compiler and on the...
Arnaud Charlet [Fri, 19 Nov 2004 11:25:50 +0000 (12:25 +0100)]
makegpr.adb (Compile): Put the compiling switches (in package Compiler and on the command line)...

* makegpr.adb (Compile): Put the compiling switches (in package
Compiler and on the command line) immediately after "-c", instead of
at the end of the command line invocation of the compiler, when
compiling a non-Ada file.
(Build_Global_Archive): When there is no need to rebuild the archive,
set Global_Archive_Exists, so that the archive is passed to the linker
if one is needed.

From-SVN: r90914

19 years agos-tposen.adb (Lock_Entry): Remove the code for raising Program_Error for Detect_Block...
Arnaud Charlet [Fri, 19 Nov 2004 11:25:38 +0000 (12:25 +0100)]
s-tposen.adb (Lock_Entry): Remove the code for raising Program_Error for Detect_Blocking which is...

* s-tposen.adb (Lock_Entry): Remove the code for raising Program_Error
for Detect_Blocking which is redundant with the check done within the
procedure Protected_Single_Entry_Call.
(Lock_Read_Only_Entry): Remove the code for raising Program_Error for
Detect_Blocking which is redundant with the check done within the
procedure Protected_Single_Entry_Call.

From-SVN: r90913

19 years agomake.adb (Gnatmake): Invoke gnatlink with -shared-libgcc when gnatbind is invoked...
Arnaud Charlet [Fri, 19 Nov 2004 11:25:28 +0000 (12:25 +0100)]
make.adb (Gnatmake): Invoke gnatlink with -shared-libgcc when gnatbind is invoked with -shared.

* make.adb (Gnatmake): Invoke gnatlink with -shared-libgcc when
gnatbind is invoked with -shared.

From-SVN: r90912

19 years agoinit.c (__gnat_map_signal): map SIGSEGV to Storage_Error for AE653 vthreads.
Arnaud Charlet [Fri, 19 Nov 2004 11:25:15 +0000 (12:25 +0100)]
init.c (__gnat_map_signal): map SIGSEGV to Storage_Error for AE653 vthreads.

* init.c (__gnat_map_signal): map SIGSEGV to Storage_Error for AE653
vthreads.
(init_float): Eliminate initialization of floating point status for
AE653. The instructions have no effect for vThreads.

From-SVN: r90911

19 years agognat1drv.adb, [...]: Output the copyright message on a separate line from the version...
Arnaud Charlet [Fri, 19 Nov 2004 11:25:05 +0000 (12:25 +0100)]
gnat1drv.adb, [...]: Output the copyright message on a separate line from the version message.

* gnat1drv.adb, gnatbind.adb, gnatchop.adb, gnatfind.adb, gnatlink.adb,
gnatls.adb, gnatxref.adb, gprep.adb: Output the copyright message on a
separate line from the version message.

From-SVN: r90910

19 years agoexp_pakd.adb (Convert_To_PAT_Type): After replacing the original type of the object...
Arnaud Charlet [Fri, 19 Nov 2004 11:24:53 +0000 (12:24 +0100)]
exp_pakd.adb (Convert_To_PAT_Type): After replacing the original type of the object with the packed array type...

* exp_pakd.adb (Convert_To_PAT_Type): After replacing the original
type of the object with the packed array type, set the Analyzed flag
on the object if it is an entity or simple indexed component, to avoid
spurious type errors.

From-SVN: r90909

19 years agoexpect.c: Define __unix__ when __APPLE__ is defined.
Arnaud Charlet [Fri, 19 Nov 2004 11:24:39 +0000 (12:24 +0100)]
expect.c: Define __unix__ when __APPLE__ is defined.

* expect.c: Define __unix__ when __APPLE__ is defined.

* Makefile.in: Inform the value of the variable GMEM_LIB in the
Darwin-specific section.

* lang-specs.h: Change the placement of the %1 marker.

From-SVN: r90908

19 years agoexp_dbug.ads: Update documentation to reflect simpler encoding for protected operations.
Arnaud Charlet [Fri, 19 Nov 2004 10:57:36 +0000 (11:57 +0100)]
exp_dbug.ads: Update documentation to reflect simpler encoding for protected operations.

* exp_dbug.ads: Update documentation to reflect simpler encoding for
protected operations.

* exp_ch9.adb (Build_Selected_Name): Do not include "PT" suffix in
generated name, it complicates decoding in gdb and hinders debugging
of protected operations.
(Build_Barrier_Function_Specification): Set the Needs_Debug_Info
flag for the protected entry barrier function.
(Build_Protected_Entry_Specification): Set the Needs_Debug_Info
flag for the protected entry function.

From-SVN: r90907

19 years agoexp_ch4.adb (Expand_N_Selected_Component): If the component is the discriminant of...
Arnaud Charlet [Fri, 19 Nov 2004 10:57:20 +0000 (11:57 +0100)]
exp_ch4.adb (Expand_N_Selected_Component): If the component is the discriminant of a constrained subtype...

* exp_ch4.adb (Expand_N_Selected_Component): If the component is the
discriminant of a constrained subtype, analyze the copy of the
corresponding constraint, because in some cases it may be only
partially analyzed.
Removes long-lived ??? comments.

* exp_ch7.adb (Establish_Transient_Scope): Remove complex code that
handled controlled or secondary-stack expressions within the
iteration_scheme of a loop.

* sem_ch5.adb (Analyze_Iteration_Scheme): Build a block to evaluate
bounds that may contain functions calls, to prevent memory leaks when
the bound contains a call to a function that uses the secondary stack.
(Check_Complex_Bounds): Subsidiary of Analyze_Iteration_Scheme, to
generate temporaries for loop bounds that might contain function calls
that require secondary stack and/or finalization actions.

* sem_ch4.adb (Analyze_Indexed_Component_Form): If the prefix is a
selected component and the selector is overloadable (not just a
function) treat as function call, Analyze_Call will disambiguate if
necessary.
(Analyze_Selected_Component): Do not generate an actual subtype for the
selected component if expansion is disabled. The actual subtype is only
needed for constraint checks.
(Analyze_Allocator): If restriction No_Streams is set, then do
not permit objects to be declared of a stream type, or of a
composite type containing a stream.

* restrict.ads: Remove the a-stream entry from Unit_Array, since
No_Streams no longer prohibits with'ing this package.

* sem_ch3.adb (Build_Derived_Record_Type): If the parent type has
discriminants, but the parent base has unknown discriminants, there is
no discriminant constraint to inherit. Such a discrepancy can arise
when the actual for a formal type with unknown discriminants is a
similar private type whose full view has discriminants.
(Analyze_Object_Declaration): If restriction No_Streams is set, then
do not permit objects to be declared of a stream type, or of a
composite type containing a stream.

From-SVN: r90906

19 years agoerrout.ads, errout.adb: (First_Sloc): New function
Arnaud Charlet [Fri, 19 Nov 2004 10:56:53 +0000 (11:56 +0100)]
errout.ads, errout.adb: (First_Sloc): New function

* errout.ads, errout.adb: (First_Sloc): New function

* par-ch5.adb (P_Condition): Check for redundant parens is now a style
check (-gnatyx) instead of being included as a redundant construct
warning.

* sem_ch6.adb: Change name Style_Check_Subprogram_Order to
Style_Check_Order_Subprograms.

* style.ads, styleg.ads, styleg.adb, styleg-c.adb, stylesw.ads,
stylesw.adb: Add Style_Check_Xtra_Parens

* usage.adb: Add line for -gnatyx (check extra parens)

* vms_data.ads: Add entry for STYLE_CHECKS=XTRA_PARENS => -gnatyx

From-SVN: r90905

19 years agoeinfo.ads, einfo.adb: Remove Is_Psected flag, no longer used
Arnaud Charlet [Fri, 19 Nov 2004 10:56:37 +0000 (11:56 +0100)]
einfo.ads, einfo.adb: Remove Is_Psected flag, no longer used

* einfo.ads, einfo.adb: Remove Is_Psected flag, no longer used
(Has_Rep_Pragma): New function
(Has_Attribute_Definition_Clause): New function
(Record_Rep_Pragma): Moved here from sem_ch13.adb
(Get_Rep_Pragma): Remove junk kludge for Stream_Convert pragma

* sem_ch13.ads, sem_ch13.adb (Record_Rep_Pragma): Moved to einfo.adb

* exp_prag.adb: (Expand_Pragma_Common_Object): New procedure
(Expand_Pragma_Psect_Object): New procedure
These procedures contain the revised and cleaned up processing for
these two pragmas. This processing was formerly in Sem_Prag, but
is more appropriately moved here. The cleanup involves making sure
that the pragmas are properly attached to the tree, and that no
nodes are improperly shared.

* sem_prag.adb: Move expansion of Common_Object and Psect_Object
pragmas to Exp_Prag, which is more appropriate.
Attach these two pragmas to the Rep_Item chain Use Rep_Item chain to
check for duplicates Remove use of Is_Psected flag, no longer needed.
Use new Make_String_Literal function with string.

* exp_attr.adb (Expand_Fpt_Attribute): The floating-point attributes
that are functions return universal values, that have to be converted
to the context type.
Use new Make_String_Literal function with string.
(Get_Stream_Convert_Pragma): New function, replaces the use of
Get_Rep_Pragma, which had to be kludged to work in this case.

* freeze.adb: Use new Has_Rep_Pragma function

* exp_intr.adb, exp_ch3.adb, sem_attr.adb: Use new Make_String_Literal
function with string.
Use new Has_Rep_Pragma function.

* tbuild.ads, tbuild.adb (Make_String_Literal): New function, takes
string argument.

From-SVN: r90904

19 years agoexp_dist.adb (Build_RPC_Receiver_Body): New subprogram.
Arnaud Charlet [Fri, 19 Nov 2004 10:56:15 +0000 (11:56 +0100)]
exp_dist.adb (Build_RPC_Receiver_Body): New subprogram.

* exp_dist.adb (Build_RPC_Receiver_Body): New subprogram. This
procedures factors the common processing for building an RPC receiver
for an RCI package or an RACW type.
Stylistic cleanup: change '/= Empty' to 'Present ()'; move body of
Build_Remote_Subprogram_Proxy_Type into proper alphabetical order.
(Get_PCS_Name): New subprogram. Returns the name of the PCS currently
in use.
(Specific_Add_RACW_Features): New subprogram. PCS-specific part of
Add_RACW_Features.
(Specific_Add_RAST_Features): New subprogram. PCS-specific part of
Add_RAST_Features.
(Assign_Subprogram_Identifier): New subprogram. Provision for assigning
distribution subprogram identifiers that are either subprogram numbers
or strings.
(Get_Subprogram_Ids): New subprogram. Retrieve both the numeric and
string distribution identifiers assigned to a given subprogram.
(Get_Subprogram_Id): Reimplement in terms of Get_Subprogram_Ids.
(Add_RAS_Dereference_TSS): Add comments.
(Build_General_Calling_Stubs): Note that the RACW_Type formal parameter
is not referenced yet because it will be used by the PolyORB DSA
implementation.
(Insert_Partition_Check): Remove fossile code.
(First_RCI_Subprogram_Id): Document this constant.
(Add_RAS_Access_TSS): Correct the setting of the Etype of the
RAS_Access TSS.
(Get_Pkg_Name_String): Remove subprogram. Usage occurrences are
replaced with calls to Get_Library_Unit_Name_String. Previously there
were several instances of the same code in different locations in the
compiler; this checkin completes the replacement of all of these
instances with calls to a common subprogram.
Minor reformatting.

* sem_dist.adb: Remove comment noting that RPC receiver generation
should be disabled for RACWs that implement RASs.
(Process_Partition_Id): Use new subprogram Get_Library_Unit_Name_String.

* sem_util.ads, sem_util.adb (Has_Stream): New function
(Get_Library_Unit_Name_String): New subprogram to retrieve the fully
qualified name of a library unit into the name buffer.
(Note_Possible_Modification): Generate a reference only
if the context comes from source.

* snames.ads (PCS_Names): New subtype corresponding to names of
supported implementations of the Partition Communication Subsystem
(PCS) (i.e. the runtime library support modules for the distributed
systems annex).

From-SVN: r90903

19 years agobutil.ads, [...] (Get_Unit_Name_String): Remove incomplete duplicate implementation...
Arnaud Charlet [Fri, 19 Nov 2004 10:55:59 +0000 (11:55 +0100)]
butil.ads, [...] (Get_Unit_Name_String): Remove incomplete duplicate implementation of this subprogram from butil.

* butil.ads, butil.adb, bindgen.adb (Get_Unit_Name_String): Remove
incomplete duplicate implementation of this subprogram from butil.

From-SVN: r90902

19 years agoa-stmaco.ads, [...]: Minor reformatting througout (including new function specs)...
Arnaud Charlet [Fri, 19 Nov 2004 10:55:09 +0000 (11:55 +0100)]
a-stmaco.ads, [...]: Minor reformatting througout (including new function specs) Add ??? comments...

* a-stmaco.ads, exp_util.ads, exp_util.adb, i-cpp.ads, i-cpp.adb:
Minor reformatting througout (including new function specs)
Add ??? comments asking for clarification.

From-SVN: r90901

19 years agoa-exexpr.adb (Others_Value, [...]): New variables...
Arnaud Charlet [Fri, 19 Nov 2004 10:54:53 +0000 (11:54 +0100)]
a-exexpr.adb (Others_Value, [...]): New variables...

* a-exexpr.adb (Others_Value, All_Others_Value): New variables, the
address of which may be used to represent "others" and "all others"
choices in exception tables, instead of the current harcoded
(void *)0 and (void *)1.
(Setup_Exception): Do nothing in the GNAT SJLJ case.

* gigi.h (others_decl, all_others_decl): New decls representing the
new Others_Value and All_Others_Value objects.
(struct attrib): Rename "arg" component as "args", since GCC expects a
list of arguments in there.

* raise.c (GNAT_OTHERS, GNAT_ALL_OTHERS): Are now the address of the
corresponding objects exported by a-exexpr, instead of hardcoded dummy
addresses.

* trans.c (Exception_Handler_to_gnu_zcx): Use the address of
others_decl and all_others_decl instead of hardcoded dummy addresses
to represent "others" and "all others" choices, which is cleaner and
more flexible with respect to the possible eh pointer encoding policies.

* utils.c (init_gigi_decls): Initialize others_decl and all_others_decl.
(process_attributes): Account for the naming change of the "args"
attribute list entry component.

* decl.c (build_attr_list): Rename into prepend_attributes to allow
cumulating attributes for different entities into a single list.
(gnat_to_gnu_entity): Use prepend_attributes to build the list of
attributes for the current entity and propagate first subtype
attributes to other subtypes.
<E_Procedure>: Attribute arguments are attr->args and not
attr->arg any more.
(build_attr_list): Ditto. Make attr->args a TREE_LIST when there is an
argument provided, as this is what GCC expects. Use NULL_TREE instead
of 0 for trees.

From-SVN: r90900

19 years ago* adaint.h, adaint.c
Arnaud Charlet [Fri, 19 Nov 2004 10:54:33 +0000 (11:54 +0100)]
* adaint.h, adaint.c
(__gnat_portable_spawn): Fix cast of spawnvp third parameter
to avoid warnings.
Add also a cast to kill another warning.
(win32_no_block_spawn): Initialize CreateProcess's dwCreationFlags
parameter with the priority class of the parent process instead of
always using the NORMAL_PRIORITY_CLASS.
(__gnat_dup): New function.
(__gnat_dup2): New function.
(__gnat_is_symbolic_link): Enable the effective body of this
function when __APPLE__ is defined.

* g-os_lib.ads, g-os_lib.adb (Spawn): Two new procedures.
Update comments.

From-SVN: r90899

19 years agoconfig/stormy16/stormy16.c (combine_bnp): Add code to handle zero_extension and lshif...
Nick Clifton [Fri, 19 Nov 2004 09:47:23 +0000 (09:47 +0000)]
config/stormy16/stormy16.c (combine_bnp): Add code to handle zero_extension and lshiftrt insns.

config/stormy16/stormy16.c (combine_bnp): Add code to handle zero_extension and
  lshiftrt insns.
Replace uses of XEXP(...) with either SET_DEST() or SET_SRC() where
  appropriate.
config/stormy16.stormy16.md (bclrx3, bsetx3): New patterns to handle bp and bn
  insn patterns with a zero_extend rtx inside them.

From-SVN: r90898

19 years ago* config/arm/arm.md (generic_sched): Make const.
Ian Lance Taylor [Fri, 19 Nov 2004 05:58:34 +0000 (05:58 +0000)]
* config/arm/arm.md (generic_sched): Make const.

From-SVN: r90897

19 years agointegrate.c (has_func_hard_reg_initial_val, [...]): Make them static.
Kazu Hirata [Fri, 19 Nov 2004 02:58:33 +0000 (02:58 +0000)]
integrate.c (has_func_hard_reg_initial_val, [...]): Make them static.

* integrate.c (has_func_hard_reg_initial_val,
get_func_hard_reg_initial_val): Make them static.
* integrate.h: Remove the corresponding prototypes.

From-SVN: r90895

19 years agoemit-rtl.c (classify_insn): Make it static.
Kazu Hirata [Fri, 19 Nov 2004 02:55:34 +0000 (02:55 +0000)]
emit-rtl.c (classify_insn): Make it static.

* emit-rtl.c (classify_insn): Make it static.
* rtl.h: Remove the corresponding prototype.

From-SVN: r90894

19 years agodwarf2asm.h (dw2_asm_output_pcel): Stub out with #if 0.
Ben Elliston [Fri, 19 Nov 2004 02:45:15 +0000 (02:45 +0000)]
dwarf2asm.h (dw2_asm_output_pcel): Stub out with #if 0.

* dwarf2asm.h (dw2_asm_output_pcel): Stub out with #if 0.
(dw2_asm_output_delta_sleb128): Likewise.
* dwarf2asm.c (dw2_asm_output_pcrel): Likewise.
(dw2_asm_output_delta_sleb128): Likewise.

From-SVN: r90893

19 years ago* tree-ssa-alias.c: Fix comment.
Adam Nemet [Fri, 19 Nov 2004 02:38:25 +0000 (02:38 +0000)]
* tree-ssa-alias.c: Fix comment.

From-SVN: r90892

19 years ago* tree-outof-ssa.c: Fix a comment typo.
Kazu Hirata [Fri, 19 Nov 2004 00:26:51 +0000 (00:26 +0000)]
* tree-outof-ssa.c: Fix a comment typo.

From-SVN: r90891

19 years agoDaily bump.
GCC Administrator [Fri, 19 Nov 2004 00:16:31 +0000 (00:16 +0000)]
Daily bump.

[[Split portion of a mixed commit.]]

From-SVN: r90889.2

19 years agoDaily bump.
GCC Administrator [Fri, 19 Nov 2004 00:16:27 +0000 (00:16 +0000)]
Daily bump.

[[Split portion of a mixed commit.]]

From-SVN: r90888.2

19 years agopredict.h (predict_insn): Remove extern declaration.
Ben Elliston [Fri, 19 Nov 2004 00:03:14 +0000 (00:03 +0000)]
predict.h (predict_insn): Remove extern declaration.

* predict.h (predict_insn): Remove extern declaration.
* predict.c (predict_insn): Make static.

From-SVN: r90884

19 years ago* config/rs6000/rs6000.c (function_arg): Don't return BLKmode regs.
Alan Modra [Thu, 18 Nov 2004 22:30:58 +0000 (22:30 +0000)]
* config/rs6000/rs6000.c (function_arg): Don't return BLKmode regs.

From-SVN: r90883

19 years ago* gcc.dg/pr16286.c: Test __pixel and __bool keywords.
Ben Elliston [Thu, 18 Nov 2004 21:13:36 +0000 (21:13 +0000)]
* gcc.dg/pr16286.c: Test __pixel and __bool keywords.

From-SVN: r90882

19 years agoarm.c (const_double_needs_minipool): New function to determine if a CONST_DOUBLE...
Nicolas Pitre [Thu, 18 Nov 2004 20:28:04 +0000 (20:28 +0000)]
arm.c (const_double_needs_minipool): New function to determine if a CONST_DOUBLE should be pushed to the minipool.

* config/arm/arm.c (const_double_needs_minipool): New function to
determine if a CONST_DOUBLE should be pushed to the minipool.
(note_invalid_constants): Use it.

From-SVN: r90881

19 years ago2004-11-18 Jeroen Frijters <jeroen@frijters.net>
Jeroen Frijters [Thu, 18 Nov 2004 20:24:33 +0000 (20:24 +0000)]
2004-11-18  Jeroen Frijters  <jeroen@frijters.net>

* java/net/URLStreamHandler.java
(parseURL): Fixed file path canonicalisation.

From-SVN: r90880

19 years ago2004-11-18 Jeroen Frijters <jeroen@frijters.net>
Michael Koch [Thu, 18 Nov 2004 19:39:58 +0000 (19:39 +0000)]
2004-11-18  Jeroen Frijters  <jeroen@frijters.net>

* java/net/URLStreamHandler.java
(parseURL): Fixed file path canonicalisation.

From-SVN: r90879

19 years agosum_diff.cc: Use VERIFY.
Paolo Carlini [Thu, 18 Nov 2004 19:11:41 +0000 (19:11 +0000)]
sum_diff.cc: Use VERIFY.

2004-11-18  Paolo Carlini  <pcarlini@suse.de>

* testsuite/26_numerics/numeric/sum_diff.cc: Use VERIFY.
* testsuite/ext/array_allocator/1.cc: Likewise.
* testsuite/ext/array_allocator/2.cc: Likewise.
* testsuite/ext/array_allocator/3.cc: Likewise.
* testsuite/ext/enc_filebuf/char/13598.cc: Likewise.

From-SVN: r90878

19 years agoURLClassLoader.java: Whitespace cleanup.
Michael Koch [Thu, 18 Nov 2004 19:00:32 +0000 (19:00 +0000)]
URLClassLoader.java: Whitespace cleanup.

2004-11-18  Michael Koch  <konqueror@gmx.de>

* java/net/URLClassLoader.java: Whitespace cleanup.

From-SVN: r90877

19 years agoComplete 1.4 support
Robert Schuster [Thu, 18 Nov 2004 18:26:54 +0000 (18:26 +0000)]
Complete 1.4 support

2004-11-18  Robert Schuster <address@bogus.example.com>

Complete 1.4 support
* java/beans/PropertyDescriptor.java:
(setReadMethod): New method
(setWriteMethod): New method
(equals): Implemented (1.4)
(checkMethods): operates on arguments now (private)

From-SVN: r90876

19 years agoppc-bitfield1.c: Skip if not LP64, don't specify -m64.
Janis Johnson [Thu, 18 Nov 2004 18:08:21 +0000 (18:08 +0000)]
ppc-bitfield1.c: Skip if not LP64, don't specify -m64.

* gcc.dg/ppc-bitfield1.c: Skip if not LP64, don't specify -m64.
* gcc.dg/ppc-and-1.c: Ditto.
* gcc.dg/ppc-compare-1.c: Ditto.
* gcc.dg/ppc-mov-1.c: Ditto

From-SVN: r90875

19 years agoInet6Address.java (getHostAddress): Fix textual representation of IPv6 address with...
Mattias Rehnberg [Thu, 18 Nov 2004 16:11:40 +0000 (17:11 +0100)]
Inet6Address.java (getHostAddress): Fix textual representation of IPv6 address with embedded zeroes to conform to...

2004-11-18  Mattias Rehnberg  <Mattias.Rehnberg@home.se>

* java/net/Inet6Address.java (getHostAddress): Fix textual
representation of IPv6 address with embedded zeroes
to conform to RFC 2373.

From-SVN: r90874

19 years agoarm.c (target_float_switch): New variable..
Paul Brook [Thu, 18 Nov 2004 15:59:48 +0000 (15:59 +0000)]
arm.c (target_float_switch): New variable..

* config/arm/arm.c (target_float_switch): New variable..
(arm_override_options): Use TARGET_DEFAULT_FLOAT_ABI and
target_float_switch.
* config/arm/arm.h (target_float_switch): Declare.
(ARM_FLAG_SOFT_FLOAT): Remove.
(TARGET_SWITCHES): Remove hard-float and soft-float.
(TARGET_OPTIONS): Add hard-float and soft-float.
(TARGET_DEFAULT_FLOAT_ABI): Define.
* config/arm/coff.h (TARGET_DEFAULT_FLOAT_ABI): Define
(TARGET_DEFAULT): Don't use ARM_FLAG_SOFT_FLOAT.
* config/arm/elf.h: Don't use ARM_FLAG_SOFT_FLOAT.
* config/arm/netbsd-elf.h: Ditto.
* config/arm/netbsd.h: Ditto.
* config/arm/pe.h: Ditto.
* config/arm/unknown-elf.h: Ditto.
* config/arm/wince-pe.h: Ditto.
* config/arm/linux-elf.h (TARGET_DEFAULT_FLOAT_ABI): Define.
* config/arm/semi.h (TARGET_DEFAULT_FLOAT_ABI): Define.
* config/arm/semiaof.h (TARGET_DEFAULT_FLOAT_ABI): Define.

From-SVN: r90872

19 years agoarm.c (target_float_switch): New variable..
Paul Brook [Thu, 18 Nov 2004 15:58:07 +0000 (15:58 +0000)]
arm.c (target_float_switch): New variable..

* config/arm/arm.c (target_float_switch): New variable..
(arm_override_options): Use TARGET_DEFAULT_FLOAT_ABI and
target_float_switch.
* config/arm/arm.h (target_float_switch): Declare.
(ARM_FLAG_SOFT_FLOAT): Remove.
(TARGET_SWITCHES): Remove hard-float and soft-float.
(TARGET_OPTIONS): Add hard-float and soft-float.
(TARGET_DEFAULT_FLOAT_ABI): Define.
* config/arm/coff.h (TARGET_DEFAULT_FLOAT_ABI): Define
(TARGET_DEFAULT): Don't use ARM_FLAG_SOFT_FLOAT.
* config/arm/elf.h: Don't use ARM_FLAG_SOFT_FLOAT.
* config/arm/netbsd-elf.h: Ditto.
* config/arm/netbsd.h: Ditto.
* config/arm/pe.h: Ditto.
* config/arm/unknown-elf.h: Ditto.
* config/arm/wince-pe.h: Ditto.
* config/arm/linux-elf.h (TARGET_DEFAULT_FLOAT_ABI): Define.
* config/arm/semi.h (TARGET_DEFAULT_FLOAT_ABI): Define.
* config/arm/semiaof.h (TARGET_DEFAULT_FLOAT_ABI): Define.

[[Split portion of a mixed commit.]]

From-SVN: r90871.2

19 years agoaltivec.md (VI, VF, V): New mode macros.
Nathan Sidwell [Thu, 18 Nov 2004 15:52:22 +0000 (15:52 +0000)]
altivec.md (VI, VF, V): New mode macros.

* config/rs6000/altivec.md (VI, VF, V): New mode macros.
(altivec_lvx_4si, altivec_lvx_8hi, altivec_lvx_16qi,
altivec_lvx_4sf): Rename and replace with ...
(altivec_lvx_<mode>): ... mode macro version.
(altivec_stvx_4si, altivec_stvx_8hi, altivec_stvx_16qi,
altivec_stvx_4sf): Rename and replace with ...
(altivec_stvx_<mode>): ... mode macro version.
(movv4si, movv8hi, movv16qi, movv4sf}): Replace with ...
(mov<mode>): ... mode macro version.
(*movv4si_internal, *movv8hi_internal1, *movv16qi_internal1,
*movv4sf_internal1): Replace with ...
(*mov<mode>_internal): ... mode macro version.
(get_vrsave_internal, *set_vrsave_internal, *save_world,
*restore_world): Unquote output statements.
* config/rs6000/rs6000.c (altivec_expand_ld_builtin,
altivec_expand_st_builtin): Adjust insn names.

From-SVN: r90870

19 years agors6000.c (rs6000_complex_function_value): Revert previous change.
Aldy Hernandez [Thu, 18 Nov 2004 15:51:18 +0000 (15:51 +0000)]
rs6000.c (rs6000_complex_function_value): Revert previous change.

* config/rs6000/rs6000.c (rs6000_complex_function_value): Revert
previous change.
(rs6000_override_options): Likewise.
(spe_build_register_parallel): Handle complex doubles on e500v2.
(rs6000_spe_function_arg): Likewise.
(function_arg): Likewise.
(rs6000_function_value): Likewise.
(rs6000_libcall_value): Likewise.

[[Split portion of a mixed commit.]]

From-SVN: r90868.2

19 years agoStackTraceElement.java: Made final.
Jeroen Frijters [Thu, 18 Nov 2004 15:26:45 +0000 (15:26 +0000)]
StackTraceElement.java: Made final.

2004-11-18  Jeroen Frijters  <address@bogus.example.com>

* java/lang/StackTraceElement.java: Made final.
* java/nio/channels/Channels.java: Added private constructor.
* java/rmi/Naming.java: Added private constructor.
* java/rmi/registry/LocateRegistry.java: Added private constructor.
* java/rmi/server/RMIClassLoader.java: Added private constructor.
* java/security/KeyPairGeneratorSpi.java
(clone): Made protected and simplified implementation.
* java/text/DateFormat.java
(allFields): Made package accessible.
* java/text/DecimalFormat.java
(formatInternal): Made private.
* java/text/Format.java
(formatInternal): Made private.
* java/util/logging/Handler.java: Made constructor protected.
* java/util/regex/Matcher.java: Made final.
* java/util/regex/Pattern.java: Made final.
* javax/crypto/CipherInputStream.java
(mark): Corrected mark parameter type (from long to int).
* javax/crypto/ExemptionMechanism.java
(finalize): Added.
* javax/crypto/Mac.java
(getMacLength): Made final.
(clone): Made final.
* javax/imageio/ImageIO.java: Added private constructor.
* javax/imageio/stream/ImageInputStreamImpl.java
(checkClosed): Made final.
* javax/net/ssl/SSLPermission.java: Made final.
* javax/print/DocFlavor.java
(hostEncoding): Added work-around to prevent the field from being
a compile time constant.
* javax/print/attribute/AttributeSetUtilities.java: Added private
constructor.
(UnmodifiableDocAttributeSet): Made private.
(UnmodifiablePrintJobAttributeSet): Made private.
(UnmodifiablePrintRequestAttributeSet): Made private.
(UnmodifiablePrintServiceAttributeSet): Made private.
(SynchronizedAttributeSet): Made private.
(SynchronizedDocAttributeSet): Made private.
(SynchronizedPrintJobAttributeSet): Made private.
(SynchronizedPrintRequestAttributeSet): Made private.
(SynchronizedPrintServiceAttributeSet): Made private.
* javax/security/auth/PrivateCredentialPermission.java: Made final.

From-SVN: r90866

19 years agoifcvt.c (find_if_block): Move the check for the number of edges above the loops check...
Andrew Pinski [Thu, 18 Nov 2004 14:44:54 +0000 (14:44 +0000)]
ifcvt.c (find_if_block): Move the check for the number of edges above the loops checking for complex edges.

2004-11-18  Andrew Pinski  <pinskia@physics.uc.edu>

        * ifcvt.c (find_if_block): Move the check for the number of edges
        above the loops checking for complex edges.
        Remove the counting of edges as we use EDGE_COUNT now.

From-SVN: r90865

19 years agoSet TARGET_ASM_FILE_END to file_end_indicate_exec_stack.3
Nick Clifton [Thu, 18 Nov 2004 14:42:38 +0000 (14:42 +0000)]
Set TARGET_ASM_FILE_END to file_end_indicate_exec_stack.3

From-SVN: r90864

19 years ago* config/i386/i386.md (define_peephole2): Revert last change.
Andreas Schwab [Thu, 18 Nov 2004 14:33:08 +0000 (14:33 +0000)]
* config/i386/i386.md (define_peephole2): Revert last change.

From-SVN: r90863

19 years agoSet TARGET_ASM_FILE_END to file_end_indicate_exec_stack.
Kazuhiro Inaoka [Thu, 18 Nov 2004 14:32:30 +0000 (14:32 +0000)]
Set TARGET_ASM_FILE_END to file_end_indicate_exec_stack.

From-SVN: r90862

19 years agolocale_facets.tcc (num_get<>::do_get(void*&)): If the failbit is set, don't set it...
Paolo Carlini [Thu, 18 Nov 2004 13:38:09 +0000 (13:38 +0000)]
locale_facets.tcc (num_get<>::do_get(void*&)): If the failbit is set, don't set it again.

2004-11-18  Paolo Carlini  <pcarlini@suse.de>

* include/bits/locale_facets.tcc (num_get<>::do_get(void*&)):
If the failbit is set, don't set it again.
(money_get<>::_M_extract): Minor stylistic tweak: consistently
with the other functions, take care of eofbit at the end.

From-SVN: r90861

19 years agotree-ssa-propagate.c (ssa_prop_init): Use FOR_ALL_BB instead of FOR_EACH_BB.
Diego Novillo [Thu, 18 Nov 2004 13:24:49 +0000 (13:24 +0000)]
tree-ssa-propagate.c (ssa_prop_init): Use FOR_ALL_BB instead of FOR_EACH_BB.

* tree-ssa-propagate.c (ssa_prop_init): Use FOR_ALL_BB instead
of FOR_EACH_BB.

From-SVN: r90860

19 years agoMakefile.in (macro_list): Depend on s-macro_list.
Jon Grimm [Thu, 18 Nov 2004 12:55:57 +0000 (12:55 +0000)]
Makefile.in (macro_list): Depend on s-macro_list.

* Makefile.in (macro_list): Depend on s-macro_list.
(s-macro_list): New target.

From-SVN: r90859

19 years agoBeanInfoEmbryo.java: Use TreeMap for proper sorting.
Craig Black [Thu, 18 Nov 2004 12:53:12 +0000 (12:53 +0000)]
BeanInfoEmbryo.java: Use TreeMap for proper sorting.

2004-11-18  Craig Black  <craig.black@aonix.com>

* gnu/java/beans/BeanInfoEmbryo.java: Use TreeMap for proper sorting.

From-SVN: r90858

19 years agore PR rtl-optimization/17107 (Opportunity to improve code generated for complex logic...
Nathan Sidwell [Thu, 18 Nov 2004 12:09:43 +0000 (12:09 +0000)]
re PR rtl-optimization/17107 (Opportunity to improve code generated for complex logical expression)

PR target/17107
* fold-const.c (RANGE_TEST_NON_SHORT_CIRCUIT): Rename to ...
(LOGICAL_OP_NON_SHORT_CIRCUIT): ... here.
(fold_range_test): Adjust.
(fold_truthop): Use it.
* config/rs6000/rs6000.h (RANGE_TEST_NON_SHORT_CIRCUIT): Rename to ...
(LOGICAL_OP_NON_SHORT_CIRCUIT): ... here.

From-SVN: r90857

19 years agoDR 434.
Paolo Carlini [Thu, 18 Nov 2004 09:52:57 +0000 (09:52 +0000)]
DR 434.

2004-11-18  Paolo Carlini  <pcarlini@suse.de>

DR 434. bitset::to_string() hard to use [Ready]
* include/std/std_bitset.h (to_string): Add three overloads, taking
fewer template arguments.
* docs/html/ext/howto.html: Add an entry for DR 434.
* testsuite/23_containers/bitset/to_string/1.cc: New.

From-SVN: r90854

19 years agoModified Files:
Victor Leikehman [Thu, 18 Nov 2004 08:45:11 +0000 (08:45 +0000)]
Modified Files:

ChangeLog generated/matmul_c4.c generated/matmul_c8.c
generated/matmul_i4.c generated/matmul_i8.c
generated/matmul_r4.c generated/matmul_r8.c m4/matmul.m4

2004-11-18  Victor Leikehman  <lei@il.ibm.com>

* m4/matmul.m4: Loops reordered to improve cache behavior.
* generated/matmul_??.c: Regenerated.

From-SVN: r90853

19 years agoi386.md (*fix_trunch_1): Add "&& 1" to insn split constraint.
Uros Bizjak [Thu, 18 Nov 2004 07:34:55 +0000 (08:34 +0100)]
i386.md (*fix_trunch_1): Add "&& 1" to insn split constraint.

        * configure/i386/i386.md (*fix_trunch_1): Add "&& 1" to
        insn split constraint.
        (define_peephole2): Remove unneeded "&& 1" from peephole2
        constraints.

From-SVN: r90852

19 years agocfg.texi (Maintaining the CFG): Remove duplicated @item element for bsi_prev; use...
Ben Elliston [Thu, 18 Nov 2004 07:13:13 +0000 (07:13 +0000)]
cfg.texi (Maintaining the CFG): Remove duplicated @item element for bsi_prev; use @findex instead.

* doc/cfg.texi (Maintaining the CFG): Remove duplicated @item
element for bsi_prev; use @findex instead.

From-SVN: r90851

19 years agoopts.h (add_input_filename): Remove extern declaration.
Ben Elliston [Thu, 18 Nov 2004 06:39:47 +0000 (06:39 +0000)]
opts.h (add_input_filename): Remove extern declaration.

* opts.h (add_input_filename): Remove extern declaration.
* opts.c (add_input_filename): Make static.

From-SVN: r90850

19 years agoMakefile.am: Correct friend function declaration.
Kriang Lerdsuwanakij [Thu, 18 Nov 2004 05:37:13 +0000 (05:37 +0000)]
Makefile.am: Correct friend function declaration.

* Makefile.am: Correct friend function declaration.
* Makefile.in: Regenerated.
* include/boehm-gc.h (JV_MARKOBJ_DECL, JV_MARKARRAY_DECL): Add
scope to function names.  Declare functions directly.
* libjava/java/lang/Class.h
(java::lang::Class): Correct friend class declaration.
(_Jv_InitClass, _Jv_GetArrayClass): Move definition to global
scope.
* libjava/java/lang/Class.h
(java::lang::Object): Correct friend class declaration.

From-SVN: r90849

19 years agoi386.c (i386_solaris_elf_named_section): Mark with ATTRIBUTE_UNUSED.
Mark Mitchell [Thu, 18 Nov 2004 01:55:21 +0000 (01:55 +0000)]
i386.c (i386_solaris_elf_named_section): Mark with ATTRIBUTE_UNUSED.

  * config/i386/i386.c (i386_solaris_elf_named_section): Mark with
ATTRIBUTE_UNUSED.

From-SVN: r90841

19 years agodefaults.h, darwin.h: Don't define TARGET_SUPPORTS_HIDDEN.
Zack Weinberg [Thu, 18 Nov 2004 01:10:12 +0000 (01:10 +0000)]
defaults.h, darwin.h: Don't define TARGET_SUPPORTS_HIDDEN.

* defaults.h, config/darwin.h: Don't define TARGET_SUPPORTS_HIDDEN.
* system.h: Poison it.
* doc/tm.texi: Delete its documentation.

From-SVN: r90840

19 years agoconfigure.ac (i[34567]86-*-solaris2.1[0-9]*): Set need_64bit_hwint=yes.
Daniel Jacobowitz [Thu, 18 Nov 2004 01:07:18 +0000 (01:07 +0000)]
configure.ac (i[34567]86-*-solaris2.1[0-9]*): Set need_64bit_hwint=yes.

libcpp:
2004-11-18  Daniel Jacobowitz  <dan@codesourcery.com>
            Mark Mitchell  <mark@codesourcery.com>

* configure.ac (i[34567]86-*-solaris2.1[0-9]*): Set
need_64bit_hwint=yes.
* configure: Regenerate.

gcc:
2004-11-18  Daniel Jacobowitz  <dan@codesourcery.com>
            Mark Mitchell  <mark@codesourcery.com>

* config/i386/sol2-10.h, config/i386/t-sol2-10: New files.
* config/i386/i386.c (i386_solaris_elf_named_section): New
function.
* config.gcc (i[34567]86-*-solaris2*): Handle Solaris 2.10.
* config/i386/sol2.h (ASM_PREFERRED_EH_DATA_FORMAT): Handle
64-bit.
(ASM_QUAD): Don't undefine for biarch targets.
* config/i386/t-sol2: Introduce multilib support.

gcc/testsuite:
2004-11-18  Daniel Jacobowitz  <dan@codesourcery.com>
            Mark Mitchell  <mark@codesourcery.com>

* testsuite/gcc.dg/pragma-init-fini-2.c: New test.

Co-Authored-By: Mark Mitchell <mark@codesourcery.com>
From-SVN: r90839

19 years ago* cgraphunit.c: Replace "it's" with "its" and fix a typo.
Ben Elliston [Thu, 18 Nov 2004 00:18:43 +0000 (00:18 +0000)]
* cgraphunit.c: Replace "it's" with "its" and fix a typo.

From-SVN: r90838

19 years agoDaily bump.
GCC Administrator [Thu, 18 Nov 2004 00:17:18 +0000 (00:17 +0000)]
Daily bump.

[[Split portion of a mixed commit.]]

From-SVN: r90836.2

19 years agoDaily bump.
GCC Administrator [Thu, 18 Nov 2004 00:17:13 +0000 (00:17 +0000)]
Daily bump.

[[Split portion of a mixed commit.]]

From-SVN: r90835.2

19 years ago* cgraph.h: Replace "it's" with "its" throughout.
Ben Elliston [Thu, 18 Nov 2004 00:09:16 +0000 (00:09 +0000)]
* cgraph.h: Replace "it's" with "its" throughout.

From-SVN: r90833

19 years agoBufferedInputStream.java (skip): Return zero on EOF.
David Daney [Wed, 17 Nov 2004 23:51:18 +0000 (23:51 +0000)]
BufferedInputStream.java (skip): Return zero on EOF.

2004-11-17  David Daney  <ddaney@avtrex.com>

* java/io/BufferedInputStream.java (skip): Return zero on EOF.

From-SVN: r90832

19 years agotarget-supports.exp (check_effective_target_vect_int): New
Janis Johnson [Wed, 17 Nov 2004 23:47:21 +0000 (23:47 +0000)]
target-supports.exp (check_effective_target_vect_int): New

* lib/target-supports.exp (check_effective_target_vect_int): New
(check_effective_target_vect_float): New
(check_effective_target_vect_double): New.
(is-effective-target): Support new effective targets keywords.
* gcc.dg/vect/vect.exp: Set target-dependent vector flags and
default action for dg-do.
* gcc.dg/vect/pr16105.c: Use new support.
* gcc.dg/vect/pr18400.c: Ditto.
* gcc.dg/vect/pr18425.c: Ditto.
* gcc.dg/vect/vect-1.c: Ditto.
* gcc.dg/vect/vect-10.c: Ditto.
* gcc.dg/vect/vect-11.c: Ditto.
* gcc.dg/vect/vect-12.c: Ditto.
* gcc.dg/vect/vect-13.c: Ditto.
* gcc.dg/vect/vect-14.c: Ditto.
* gcc.dg/vect/vect-15.c: Ditto.
* gcc.dg/vect/vect-16.c: Ditto.
* gcc.dg/vect/vect-17.c: Ditto.
* gcc.dg/vect/vect-18.c: Ditto.
* gcc.dg/vect/vect-19.c: Ditto.
* gcc.dg/vect/vect-2.c: Ditto.
* gcc.dg/vect/vect-20.c: Ditto.
* gcc.dg/vect/vect-21.c: Ditto.
* gcc.dg/vect/vect-22.c: Ditto.
* gcc.dg/vect/vect-23.c: Ditto.
* gcc.dg/vect/vect-24.c: Ditto.
* gcc.dg/vect/vect-25.c: Ditto.
* gcc.dg/vect/vect-26.c: Ditto.
* gcc.dg/vect/vect-27.c: Ditto.
* gcc.dg/vect/vect-27a.c: Ditto.
* gcc.dg/vect/vect-28.c: Ditto.
* gcc.dg/vect/vect-29.c: Ditto.
* gcc.dg/vect/vect-29a.c: Ditto.
* gcc.dg/vect/vect-3.c: Ditto.
* gcc.dg/vect/vect-30.c: Ditto.
* gcc.dg/vect/vect-31.c: Ditto.
* gcc.dg/vect/vect-32.c: Ditto.
* gcc.dg/vect/vect-33.c: Ditto.
* gcc.dg/vect/vect-34.c: Ditto.
* gcc.dg/vect/vect-35.c: Ditto.
* gcc.dg/vect/vect-36.c: Ditto.
* gcc.dg/vect/vect-37.c: Ditto.
* gcc.dg/vect/vect-38.c: Ditto.
* gcc.dg/vect/vect-4.c: Ditto.
* gcc.dg/vect/vect-40.c: Ditto.
* gcc.dg/vect/vect-41.c: Ditto.
* gcc.dg/vect/vect-42.c: Ditto.
* gcc.dg/vect/vect-43.c: Ditto.
* gcc.dg/vect/vect-44.c: Ditto.
* gcc.dg/vect/vect-45.c: Ditto.
* gcc.dg/vect/vect-46.c: Ditto.
* gcc.dg/vect/vect-47.c: Ditto.
* gcc.dg/vect/vect-48.c: Ditto.
* gcc.dg/vect/vect-48a.c: Ditto.
* gcc.dg/vect/vect-49.c: Ditto.
* gcc.dg/vect/vect-5.c: Ditto.
* gcc.dg/vect/vect-50.c: Ditto.
* gcc.dg/vect/vect-51.c: Ditto.
* gcc.dg/vect/vect-52.c: Ditto.
* gcc.dg/vect/vect-53.c: Ditto.
* gcc.dg/vect/vect-54.c: Ditto.
* gcc.dg/vect/vect-55.c: Ditto.
* gcc.dg/vect/vect-56.c: Ditto.
* gcc.dg/vect/vect-56a.c: Ditto.
* gcc.dg/vect/vect-57.c: Ditto.
* gcc.dg/vect/vect-58.c: Ditto.
* gcc.dg/vect/vect-59.c: Ditto.
* gcc.dg/vect/vect-6.c: Ditto.
* gcc.dg/vect/vect-60.c: Ditto.
* gcc.dg/vect/vect-61.c: Ditto.
* gcc.dg/vect/vect-62.c: Ditto.
* gcc.dg/vect/vect-63.c: Ditto.
* gcc.dg/vect/vect-64.c: Ditto.
* gcc.dg/vect/vect-65.c: Ditto.
* gcc.dg/vect/vect-66.c: Ditto.
* gcc.dg/vect/vect-67.c: Ditto.
* gcc.dg/vect/vect-68.c: Ditto.
* gcc.dg/vect/vect-69.c: Ditto.
* gcc.dg/vect/vect-7.c: Ditto.
* gcc.dg/vect/vect-72.c: Ditto.
* gcc.dg/vect/vect-72a.c: Ditto.
* gcc.dg/vect/vect-73.c: Ditto.
* gcc.dg/vect/vect-74.c: Ditto.
* gcc.dg/vect/vect-75.c: Ditto.
* gcc.dg/vect/vect-76.c: Ditto.
* gcc.dg/vect/vect-77.c: Ditto.
* gcc.dg/vect/vect-77a.c: Ditto.
* gcc.dg/vect/vect-78.c: Ditto.
* gcc.dg/vect/vect-79.c: Ditto.
* gcc.dg/vect/vect-8.c: Ditto.
* gcc.dg/vect/vect-80.c: Ditto.
* gcc.dg/vect/vect-82.c: Ditto.
* gcc.dg/vect/vect-82_64.c: Ditto.
* gcc.dg/vect/vect-83.c: Ditto.
* gcc.dg/vect/vect-83_64.c: Ditto.
* gcc.dg/vect/vect-9.c: Ditto.
* gcc.dg/vect/vect-all.c: Ditto.
* gcc.dg/vect/vect-none.c: Ditto.

Co-Authored-By: Aldy Hernandez <aldyh@redhat.com>
From-SVN: r90831

19 years ago* doc/rtl.texi (Flags): Grammar fix.
Ben Elliston [Wed, 17 Nov 2004 23:15:06 +0000 (10:15 +1100)]
* doc/rtl.texi (Flags): Grammar fix.

From-SVN: r90830

19 years agoexpmed.c (alg_code): Add alg_unknown.
Kazu Hirata [Wed, 17 Nov 2004 22:29:29 +0000 (22:29 +0000)]
expmed.c (alg_code): Add alg_unknown.

* expmed.c (alg_code): Add alg_unknown.
(alg_hash_entry): New.
(NUM_ALG_HASH_ENTRIES): Likewise.
(alg_hash): Likewise.
(synth_mult): Cache the result into alg_hash.

From-SVN: r90825

19 years agot-darwin: Augment SHLIB_MAPFILES with config/rs6000/libgcc-ppc64.ver.
Zack Weinberg [Wed, 17 Nov 2004 22:23:10 +0000 (22:23 +0000)]
t-darwin: Augment SHLIB_MAPFILES with config/rs6000/libgcc-ppc64.ver.

* config/rs6000/t-darwin: Augment SHLIB_MAPFILES with
config/rs6000/libgcc-ppc64.ver.

From-SVN: r90824

19 years agobasic-block.h, [...]: Remove unused prototypes.
Kazu Hirata [Wed, 17 Nov 2004 22:06:00 +0000 (22:06 +0000)]
basic-block.h, [...]: Remove unused prototypes.

* basic-block.h, c-common.h, df.h, expr.h, output.h, rtl.h,
tree-chrec.h, tree-flow.h, tree-scalar-evolution.h,
tree-ssa-live.h, tree.h: Remove unused prototypes.

From-SVN: r90821

19 years ago* jump.c (condjump_p): Remove unreachable code.
Kazu Hirata [Wed, 17 Nov 2004 21:57:30 +0000 (21:57 +0000)]
* jump.c (condjump_p): Remove unreachable code.

From-SVN: r90820

19 years agocfgrtl.c (rtl_verify_flow_info): Don't use INSN_P when checking if an unconditional...
Kazu Hirata [Wed, 17 Nov 2004 21:55:07 +0000 (21:55 +0000)]
cfgrtl.c (rtl_verify_flow_info): Don't use INSN_P when checking if an unconditional return is followed by a barrier.

* cfgrtl.c (rtl_verify_flow_info): Don't use INSN_P when
checking if an unconditional return is followed by a barrier.

From-SVN: r90819

19 years agotree-cfg.c (edge_to_cases): Renamed from edge_to_case_leader.
Jeff Law [Wed, 17 Nov 2004 21:10:00 +0000 (14:10 -0700)]
tree-cfg.c (edge_to_cases): Renamed from edge_to_case_leader.

* tree-cfg.c (edge_to_cases): Renamed from edge_to_case_leader.
(edge_to_cases_elt): Renamed from edge_to_case_leader.
(edge_to_cases_hash): Renamed from edge_to_case_leader_hash.
(edge_to_cases_eq): Renamed from edge_to_case_leader_eq.
(edge_to_cases_cleanup, recording_case_labels_p): New functions.
(get_cases_for_edge): New function.
(start_recording_case_labels, end_recording_case_labels): Similarly.
(record_switch_edge): Don't muck with the CASE_LABEL.  Instead
chain equivalent CASE_LABEL_EXPRs together.
(get_case_leader_for_edge, get_case_leader_for_edge_hash): Kill.
(make_switch_expr_edges): Do not record edge/cases here.
(cleanup_tree_cfg): Record cases around the call to thread_jumps.
(split_critical_edges): Record cases around the edge splitting code.
(cleanup_dead_labels): Use CASE_LABEL again.
(tree_redirect_edge_and_branch): If we have a mapping from edge
to cases, use it to handle redirections.  Else do it the slow way.
* tree.h (CASE_LEADER_OR_LABEL): Kill.
(CASE_LABEL): Revert to just looking at the tree's second operand.
* tree.c (get_case_label): Kill.

From-SVN: r90817

19 years agore PR tree-optimization/18307 (merge_pointed_to_info called incorrectly)
Diego Novillo [Wed, 17 Nov 2004 21:07:03 +0000 (21:07 +0000)]
re PR tree-optimization/18307 (merge_pointed_to_info called incorrectly)

PR tree-optimization/18307
* tree-ssa-alias.c (merge_pointed_to_info): ICE if 'dest' and
'orig' are the same node.
(collect_points_to_info_r): Do not call merge_pointed_to_info
when the PHI argument is identical to the LHS.

From-SVN: r90816

19 years agogcc-dg.exp (dg-skip-if): New function.
Janis Johnson [Wed, 17 Nov 2004 17:21:46 +0000 (17:21 +0000)]
gcc-dg.exp (dg-skip-if): New function.

* lib/gcc-dg.exp (dg-skip-if): New function.
(dg-forbid-option): Remove.
* g++.dg/abi/bitfield3.C: Use dg-skip-if i?86 -m64.
* g++.dg/abi/bitfield8.C: Likewise.
* g++.dg/abi/dtor1.C: Likewise.
* g++.dg/abi/empty10.C: Likewise.
* g++.dg/abi/empty7.C: Likewise.
* g++.dg/abi/empty9.C: Likewise.
* g++.dg/abi/layout3.C: Likewise.
* g++.dg/abi/layout4.C: Likewise.
* g++.dg/abi/thunk1.C: Likewise.
* g++.dg/abi/thunk2.C: Likewise.
* g++.dg/abi/vbase11.C: Likewise.
* g++.dg/abi/vthunk2.C: Likewise.
* g++.dg/abi/vthunk3.C: Likewise.
* g++.dg/ext/attrib8.C: Likewise.
* g++.dg/opt/longbranch2.C: Likewise.
* g++.dg/opt/reg-stack4.C: Likewise.
* g++.old-deja/g++.ext/attrib1.C: Likewise.
* g++.old-deja/g++.ext/attrib2.C: Likewise.
* g++.old-deja/g++.ext/attrib3.C: Likewise.
* g++.old-deja/g++.other/store-expr1.C: Likewise.
* g++.old-deja/g++.other/store-expr2.C: Likewise.
* gcc.dg/20000609-1.c: Likewise.
* gcc.dg/20000720-1.c: Likewise.
* gcc.dg/20011107-1.c: Likewise.
* gcc.dg/20011119-1.c: Likewise.
* gcc.dg/20020108-1.c: Likewise.
* gcc.dg/20020122-2.c: Likewise.
* gcc.dg/20020122-3.c: Likewise.
* gcc.dg/20020201-3.c: Likewise.
* gcc.dg/20020206-1.c: Likewise.
* gcc.dg/20020218-1.c: Likewise.
* gcc.dg/20020310-1.c: Likewise.
* gcc.dg/20020411-1.c: Likewise.
* gcc.dg/20020418-2.c: Likewise.
* gcc.dg/20020426-1.c: Likewise.
* gcc.dg/20020426-2.c: Likewise.
* gcc.dg/20020517-1.c: Likewise.
* gcc.dg/20020523-1.c: Likewise.
* gcc.dg/20020523-2.c: Likewise.
* gcc.dg/20020729-1.c: Likewise.
* gcc.dg/20030204-1.c: Likewise.
* gcc.dg/20030826-2.c: Likewise.
* gcc.dg/20030926-1.c: Likewise.
* gcc.dg/20031202-1.c: Likewise.
* gcc.dg/980312-1.c: Likewise.
* gcc.dg/980313-1.c: Likewise.
* gcc.dg/990117-1.c: Likewise.
* gcc.dg/990424-1.c: Likewise.
* gcc.dg/990524-1.c: Likewise.
* gcc.dg/991230-1.c: Likewise.
* gcc.dg/i386-387-1.c: Likewise.
* gcc.dg/i386-387-2.c: Likewise.
* gcc.dg/i386-387-3.c: Likewise.
* gcc.dg/i386-387-4.c: Likewise.
* gcc.dg/i386-387-5.c: Likewise.
* gcc.dg/i386-387-6.c: Likewise.
* gcc.dg/i386-asm-1.c: Likewise.
* gcc.dg/i386-bitfield1.c: Likewise.
* gcc.dg/i386-bitfield2.c: Likewise.
* gcc.dg/i386-loop-1.c: Likewise.
* gcc.dg/i386-loop-2.c: Likewise.
* gcc.dg/i386-loop-3.c: Likewise.
* gcc.dg/i386-pentium4-not-mull.c: Likewise.
* gcc.dg/i386-pic-1.c: Likewise.
* gcc.dg/i386-regparm.c: Likewise.
* gcc.dg/i386-signbit-1.c: Likewise.
* gcc.dg/i386-signbit-2.c: Likewise.
* gcc.dg/i386-signbit-3.c: Likewise.
* gcc.dg/i386-sse-5.c: Likewise.
* gcc.dg/i386-sse-8.c: Likewise.
* gcc.dg/i386-unroll-1.c: Likewise.
* gcc.dg/tls/opt-1.c: Likewise.
* gcc.dg/tls/opt-2.c: Likewise.
* gcc.dg/unroll-1.c: Likewise.
* gcc.misc-tests/i386-pf-3dnow-1.c: Likewise.
* gcc.misc-tests/i386-pf-athlon-1.c: Likewise.
* gcc.misc-tests/i386-pf-none-1.c: Likewise.
* gcc.misc-tests/i386-pf-sse-1.c: Likewise.

From-SVN: r90810

19 years agoSocket.java (getPort): Return 0 in error case.
Michael Koch [Wed, 17 Nov 2004 12:08:31 +0000 (12:08 +0000)]
Socket.java (getPort): Return 0 in error case.

2004-11-17  Michael Koch  <konqueror@gmx.de>

* java/net/Socket.java (getPort): Return 0 in error case.

From-SVN: r90805

19 years ago2004-11-17 Michael Koch <konqueror@gmx.de>
Michael Koch [Wed, 17 Nov 2004 11:57:55 +0000 (11:57 +0000)]
2004-11-17  Michael Koch  <konqueror@gmx.de>

*  java/nio/DirectByteBufferImpl.java
(owner): Updated comment.
(allocate): New method.

From-SVN: r90804

19 years ago* tree-ssa-propagate.c (cfg_blocks_add) Assert we're not trying
Steven Bosscher [Wed, 17 Nov 2004 10:47:07 +0000 (10:47 +0000)]
* tree-ssa-propagate.c (cfg_blocks_add) Assert we're not trying
to insert the exit or entry block.
(ssa_prop_init): Use add_control_edge to seed the algorithm.

From-SVN: r90802

19 years agoistream.tcc (getline(basic_istream<>&, basic_string<>&, _CharT)): Remove temporary...
Paolo Carlini [Wed, 17 Nov 2004 09:04:14 +0000 (09:04 +0000)]
istream.tcc (getline(basic_istream<>&, basic_string<>&, _CharT)): Remove temporary kludge for libstdc++/15002.

2004-11-17  Paolo Carlini  <pcarlini@suse.de>

* include/bits/istream.tcc (getline(basic_istream<>&, basic_string<>&,
_CharT)): Remove temporary kludge for libstdc++/15002.
* include/std/std_streambuf.h (class basic_streambuf): Declare
getline(basic_istream<>&, basic_string<>&, _CharT) as friend.
* include/bits/basic_string.h (getline(basic_istream<>&,
basic_string<>&, _CharT)): Declare optimized specializations for
char and wchar_t, using protected members of basic_streambuf.
* src/istream.cc: Define the latter.

From-SVN: r90801

19 years agoURL.java (URL): Handle case when argument is null.
Michael Koch [Wed, 17 Nov 2004 08:40:53 +0000 (08:40 +0000)]
URL.java (URL): Handle case when argument is null.

2004-11-17  Michael Koch  <konqueror@gmx.de>

* java/net/URL.java (URL): Handle case when argument is null.

From-SVN: r90800

19 years agoBeans.java, [...]: Fixed javadocs.
Michael Koch [Wed, 17 Nov 2004 08:17:20 +0000 (08:17 +0000)]
Beans.java, [...]: Fixed javadocs.

2004-11-17  Michael Koch  <konqueror@gmx.de>

* java/beans/Beans.java,
java/beans/PropertyChangeEvent.java,
java/beans/PropertyEditorSupport.java:
Fixed javadocs.

From-SVN: r90799

19 years agoTimer.java (DEFAULT_SIZE): Made static.
Michael Koch [Wed, 17 Nov 2004 08:11:22 +0000 (08:11 +0000)]
Timer.java (DEFAULT_SIZE): Made static.

2004-11-17  Michael Koch  <konqueror@gmx.de>

* java/util/Timer.java (DEFAULT_SIZE): Made static.

From-SVN: r90798

19 years agoInetAddress.java (getCanonicalHostName): Support IPv6 addresses.
Michael Koch [Wed, 17 Nov 2004 07:09:57 +0000 (07:09 +0000)]
InetAddress.java (getCanonicalHostName): Support IPv6 addresses.

2004-11-17  Michael Koch  <konqueror@gmx.de>

* java/net/InetAddress.java (getCanonicalHostName):
Support IPv6 addresses.

From-SVN: r90793

19 years agomkmap-flat.awk, [...]: If the last version assigned to a symbol was '%exclude', do...
Zack Weinberg [Wed, 17 Nov 2004 05:39:02 +0000 (05:39 +0000)]
mkmap-flat.awk, [...]: If the last version assigned to a symbol was '%exclude', do not emit it anywhere.

* mkmap-flat.awk, mkmap-symver.awk: If the last version
assigned to a symbol was '%exclude', do not emit it anywhere.
If leading_underscore is true, prefix all symbols from the
version scripts with a leading underscore before comparing
them with nm output or emitting them.  Remove support for dot
symbols.
* config/t-slibgcc-darwin (SHLIB_LINK): Use mkmap-flat.awk.
(SHLIB_MAPFILES): Use libgcc-std.ver.
(SHLIB_MKMAP_OPTS): Enable leading-underscore mode.
(SHLIB_LINK): Add -Wl,-exported_symbols_list,$(SHLIB_MAP).
* config/sh/t-linux: Use the normal libgcc-std.ver, plus
libgcc-excl.ver and libgcc-glibc.ver.

* config/sh/libgcc-excl.ver: New file.
* config/sh/libgcc-std.ver, libgcc-darwin.ver: Delete.

From-SVN: r90792

19 years agoAdd missing entry in last aix52.h ChangeLog.
David Edelsohn [Wed, 17 Nov 2004 05:21:46 +0000 (00:21 -0500)]
Add missing entry in last aix52.h ChangeLog.

From-SVN: r90791

19 years agoremove confusing and unnecessary backslashes
Bruce Korb [Wed, 17 Nov 2004 05:06:41 +0000 (05:06 +0000)]
remove confusing and unnecessary backslashes

From-SVN: r90790

19 years agocorrect misuse of variables
Bruce Korb [Wed, 17 Nov 2004 04:20:36 +0000 (04:20 +0000)]
correct misuse of variables

From-SVN: r90789