* btest-gcc.sh (TESTLOGS): Examine regressions in libstdc++,
libffi, and libjava.

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

PR libgcj/18104
* Makefile.am (CLASSPATH_SEPARATOR): Use instead of a
colon.
* Makefile.in: Regenerate.
* configure: Regenerate.
* configure.ac (CLASSPATH_SEPARATOR): Define.
* gcj/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* testsuite/lib/libjava.exp (libjava_arguments): Fix
CLASSPATH separator handling for Windows.
----------------------------------------------------------------------

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

PR c++/18093
* search.c (current_scope): Return the innermost non-block scope,
not the innermost non-block, non-namespace scope.
(at_namespace_scope_p): Adjust accordingly.
(dfs_accessible_post): Do not pass namespaces to is_friend.
(dfs_walk_once_accessible_r): Likewise.
* decl.c (grokvardecl): Adjust call to current_scope.
(build_enumerator): Likewise.
* parser.c (cp_parser_using_declaration): Likewise.
(cp_parser_direct_declarator): Use at_namespace_scope_p instead of
current_scope.
(cp_parser_class_head): Adjust call to current_scope.
* name-lookup.c (do_namespace_alias): Set the DECL_CONTEXT for the
alias.

PR c++/18020
* pt.c (tusbst_copy_and_build): Resolve enumeration constants to
their underlying values.

PR c++/18161
* typeck.c (build_binary_op): Honor build_type, even when in a
template.

PR c++/18093
* g++.dg/lookup/ns2.C: New test.

PR c++/18020
* g++.dg/template/enum4.C: New test.

PR c++/18161
* g++.dg/template/expr1.C: New test.

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

Fix for PR 18010, copy epilogue unwind info when copying epilogue insns.
* emit-rtl.c (emit_copy_of_insn_after): Copy RTX_FRAME_RELATED_P.

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

* dbxout.c: Include obstack.h.
(ASM_STABS_OP): Take XCOFF_DEBUGGING_INFO into account in
default definition.
(ASM_STABD_OP, NO_DBX_MAIN_SOURCE_DIRECTORY, DBX_CONTIN_CHAR):
Default-define here.
(DBX_CONTIN_LENGTH): Move definition with others.
(DBX_FINISH_STABS): New target macro.
(current_sym_code, current_sym_value, current_sym_addr)
(current_sym_nchars, CHARS, dbxout_continue)
(print_int_cst_octal, print_octal, print_wide_int)
(dbxout_prepare_symbol, dbxout_finish_symbol): Delete.
(stabstr_ob, stabstr_last_contin_point): New variables.
(NUMBER_FMT_LOOP): New improper macro.
(dbxout_int, dbxout_stab_value_zero, dbxout_stab_value_label)
(dbxout_stab_value_label_diff, dbxout_stab_value_internal_label)
(dbxout_stab_value_internal_label_diff, dbxout_stabd)
(dbxout_begin_stabn, dbxout_begin_stabn_sline)
(dbxout_begin_simple_stabs, dbxout_begin_simple_stabs_desc)
(dbxout_begin_complex_stabs, dbxout_finish_complex_stabs)
(stabstr_C, stabstr_S, stabstr_I, stabstr_D, stabstr_U, stabstr_O)
(stabstr_continue, DECL_ACCESSIBILITY_CHAR)
New functions and/or proper function-like macros.
(CONTIN): Use stabstr_continue, unconditionally.
(get_lang_number): Define unconditionally, with ATTRIBUTE_UNUSED.
(dbxout_init): Initialize stabstr_ob.  Check
NO_DBX_MAIN_SOURCE_DIRECTORY.  Only write out the Ltext label
if it was used.  Use the new interfaces.
(dbxout_source_file): Remove file argument; always write to
asm_out_file.  Use the new interfaces.
(dbxout_type_method_1): Remove second argument which is always
DECL_ASSEMBLER_NAME of the first argument.  Use the new interfaces.
(dbxout_type_methods): Remove write-only variables.  Use the
new interfaces.
(dbxout_parms): Refactor to remove code duplicated in each of
several successive if-else-if blocks.  Use the new interfaces.
(dbxout_function_end, emit_bincl_stab, dbxout_end_source_file)
(dbxout_source_line, dbxout_finish, dbxout_type_index)
(dbxout_type_fields, dbxout_range_type, dbxout_type, dbxout_type_name)
(dbxout_class_name_qualifiers, dbxout_symbol, dbxout_symbol_location)
(dbxout_symbol_name, dbxout_reg_parms, dbxout_args)
(dbx_output_lbrac, dbx_output_rbrac, dbxout_block):
Use the new interfaces.
* Makefile.in (dbxout.o): Update dependencies.

* defaults.h: Don't define ASM_STABD_OP.
* output.h: Prototype new dbxout_* interfaces.
* system.h: Poison DBX_OUTPUT_GCC_MARKER and DBX_FINISH_SYMBOL.
* varasm.c: Don't define ASM_STABS_OP.
(default_stabs_asm_out_constructor, default_stabs_asm_out_destructor):
Use the new dbxout.c interfaces.  Call sorry if neither
DBX_DEBUGGING_INFO nor XCOFF_DEBUGGING_INFO is defined.

* xcoffout.h: Don't define ASM_STABS_OP.
(DBX_FINISH_SYMBOL): Rewrite and rename DBX_FINISH_STABS.
(DBX_OUTPUT_MAIN_SOURCE_DIRECTORY, DBX_OUTPUT_GCC_MARKER): Delete.
(NO_DBX_MAIN_SOURCE_DIRECTORY, NO_DBX_GCC_MARKER): Define.
(DBX_OUTPUT_MAIN_SOURCE_FILE_END): Change bare block to
do { ... } while (0) idiom.

* config/alpha/alpha.c (num_source_filenames): Export.
* config/alpha/alpha.h (num_source_filenames): Declare.
(DBX_OUTPUT_SOURCE_LINE): Use new interfaces.
(SDB_OUTPUT_SOURCE_LINE): Add missing newline.
* config/m32r/m32r.h (DBX_OUTPUT_SOURCE_LINE): Use new interfaces.
Always use .debugsym.  Update commentary.
* config/mips/mips.h (DBX_OUTPUT_SOURCE_LINE): Use new interfaces.
(SDB_OUTPUT_SOURCE_LINE): Add missing newline.
* config/rs6000/linux64.h (DBX_OUTPUT_SOURCE_LINE, DBX_OUTPUT_BRAC):
Use new interfaces.
* config/rs6000/rs6000.c: If TARGET_MACHO, include gstab.h.
(macho_branch_islands): Use new interfaces.

* doc/tm.texi: Update.

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

2004-10-26  Paolo Carlini  <pcarlini@suse.de>

* include/bits/basic_string.h (append(const basic_string&),
append(size_type, _CharT)): Move out of line...
* include/bits/basic_string.tcc: ... here.

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

Daily bump.

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

Daily bump.

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

* gcc.dg/tree-ssa/20030922-2.c: Now passing, so remove xfail.

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

* expr.c (emit_group_store): Do not treat floats as BLKmode.
(emit_group_load): Same.

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

2004-10-26  Paolo Carlini  <pcarlini@suse.de>

* include/bits/basic_string.h (erase(size_type, size_type),
erase(iterator), erase(iterator, iterator)): Call _M_mutate
instead of _M_replace_safe, equivalent when the fourth argument
is zero and simpler.

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

* c-parse.in (datadef): Use pedwarn rather than error and warning
for diagnostic in case of no declaration specifiers.

testsuite:
* gcc.dg/decl-nospec-1.c, gcc.dg/decl-nospec-2.c,
gcc.dg/decl-nospec-3.c: New tests.

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

* configure.in (case ${target}): Do not build fixincludes
on platforms where it is not used.
* configure: Regenerated.

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

[gcc/objc/ChangeLog]
2004-10-26  Ziemowit Laski  <zlaski@apple.com>

        * objc-act.c (finish_class): Do not synthesize bogus
        'extern objc_object *_Foo;' declarations for @interface Foo.

[gcc/testsuite/ChangeLog]
2004-10-26  Ziemowit Laski  <zlaski@apple.com>

        * objc.dg/super-class-3.m: New test.

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

PR bootstrap/15747
* doc/install.texi (mips-sgi-irix5): Document that /bin/sh has been
reported to hang during bootstrap and that CONFIG_SHELL=/bin/ksh
can be used to work around this.

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

* config/rs6000/rs6000.h (MEMBER_TYPE_FORCES_BLK): Adjust for e500
doubles.

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

* stmt.c (expand_case): Update a comment.

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

* stmt.c (expand_case): Put an assertion that index_expr is
never INTEGER_CST.  Don't special case for constant
index_expr.

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

2004-10-26  Andrew Pinski  <pinskia@physics.uc.edu>

        PR 18162
        * c-parse.in (designator): Finish with a semi-colon.

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

Fix a problem with setting CR when splitting into rotlsi3.
OKed by Alan Modra.

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

* stmt.c (expand_case): Remove code to handle SWITCH_EXPR with
a default case only.

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

* config/rs6000/rs6000.c (rs6000_hard_regno_nregs): Adjust for
e500 doubles.
(spe_build_register_parallel): New.
(rs6000_spe_function_arg): Handle e500 doubles.
(function_arg): Same.
(spe_func_has_64bit_regs_p): Same.
(rs6000_function_value): Same.
(rs6000_libcall_value): Same.
(legitimate_lo_sum_address_p): Return false for e500 doubles.

* config/rs6000/rs6000.h (LOCAL_ALIGNMENT): Adjust for e500
doubles.
(DATA_ALIGNMENT): Same.
(CANNOT_CHANGE_MODE_CLASS): Same.

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

2004-10-26  Michael Koch  <konqueror@gmx.de>

* gnu/java/net/protocol/http/Connection.java
(getOutputStream): Implicitely switch to POST method.

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

    * expr.c (emit_group_load): Handle floats.
        (emit_group_store): Same.

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

* libjava/java/lang/Class.h
(java::lang::Class): Correct friend class declaration.

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

* c-lex.c (get_nonpadding_token): Remove.
(c_lex_with_flags): Push timevar and eat padding here.  Improve
stray token diagnostic.
(lex_string): Replace logic with switch statement, eat padding
token here.
* cp/parser.c (cp_lexer_get_preprocessor_token): Remove unneeded
padding token checking.
testsuite:
* gcc.dg/cpp/direct2.c: Adjust expected errors, robustify parser
resyncing.
* gcc.dg/cpp/direct2s.c: Likewise.

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

* btest-gcc.sh (TESTLOGS): Examine regressions in libstdc++,
libffi, and libjava.

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

PR 18149
* config/i386/darwin.h (ASM_SPEC): Undef it before defining.

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

2004-10-26  Benjamin Kosnik  <bkoz@redhat.com>

* include/ext/array_allocator.h (array::allocate): Check for valid
array object, use its size member function directly.
* testsuite/ext/array_allocator/3.cc: New.
* docs/html/20_util/allocator.html: Add docs.

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

Index: gcc/gcc/ChangeLog
2004-10-25  Geoffrey Keating  <geoffk@apple.com>

* config/darwin.h (LINK_SPEC): Default weak_reference_mismatches
to 'non-weak'.
(MAKE_DECL_ONE_ONLY): Set DECL_WEAK.
(ASM_MAKE_LABEL_LINKONCE): Delete.
(ASM_WEAKEN_DECL): New.
(ASM_DECLARE_OBJECT_NAME): Look at DECL_WEAK not DECL_ONE_ONLY.
(ASM_DECLARE_FUNCTION_NAME): Likewise.
(TEXT_SECTION_ASM_OP): Add a tab.
(DATA_SECTION_ASM_OP): Likewise.
(SECTION_FUNCTION): Add a tab.  Use fputs.  Don't call
data_section on every section change.
(EXTRA_SECTIONS): Add a bunch of new extra sections.
(EXTRA_SECTION_FUNCTIONS): Likewise.
(USE_SELECT_SECTION_FOR_FUNCTIONS): Define.
(JCR_SECTION_NAME): Define.
(TARGET_SECTION_TYPE_FLAGS): Don't define.
* config/darwin.c (darwin_encode_section_info): A symbol is defined
in this file if it is not weak.
(textcoal_section): Delete.
(datacoal_section): Delete.
(darwin_make_decl_one_only): Delete.
(machopic_select_section): Handle functions.
(darwin_asm_named_section): Add a tab.
(darwin_section_type_flags): Delete.
(darwin_unique_section): Delete contents.
(darwin_emit_unwind_label): Add a tab.  Make decls weak if
DECL_WEAK is set.
* config/darwin-protos.h (darwin_section_type_flags): Delete.
(darwin_make_decl_one_only): Delete.
(text_coal_section): New.
(text_unlikely_section): New.
(text_unlikely_coal_section): New.
(const_coal_section): New.
(data_coal_section): New.
(const_data_coal_section): New.
* varasm.c (function_section): Honour
USE_SELECT_SECTION_FOR_FUNCTIONS.
* dwarf2out.c (output_call_frame_info): Look at DECL_WEAK when
TARGET_USES_WEAK_UNWIND_INFO is in effect.
* dbxout.c (dbxout_source_file): Don't change sections while
a function is being output.

Index: gcc/testsuite/ChangeLog
2004-10-25  Geoffrey Keating  <geoffk@apple.com>

* objc.dg/image-info.m: Update for changes to section selection.

Index: libjava/ChangeLog
2004-10-25  Geoffrey Keating  <geoffk@apple.com>

* Makefile.am (DARWIN_CRT_SRC): New.
(libgcj_la_SOURCES): Use it.
* configure.ac: Define USING_DARWIN_CRT when on Darwin.
* darwin.cc: New file.
* include/jvm.h (_Jv_RegisterClasses): Constify.
(_Jv_RegisterClasses_Counted): New prototype.
* java/lang/Class.h: Include stddef.h.
(_Jv_RegisterClasses): Constify.
(_Jv_RegisterClasses_Counted): New prototype.
(Object): Make '_Jv_RegisterClasses_Counted' a friend.
* java/lang/natClassLoader.cc (_Jv_RegisterClasses): Constify.
(_Jv_RegisterClasses_Counted): New function.
* configure: Regenerate.
* Makefile.in: Regenerate.
* gcj/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.

Index: libstdc++-v3/ChangeLog
2004-10-25  Geoffrey Keating  <geoffk@apple.com>

* libsupc++/new_op.cc (new): Make weak.
* libsupc++/new_opnt.cc (new): Make weak.
* libsupc++/new_opv.cc (new): Make weak.
* libsupc++/new_opvnt.cc (new): Make weak.
* libsupc++/delete_op.cc (delete): Make weak.
* libsupc++/delete_opnt.cc (delete): Make weak.
* libsupc++/delete_opv.cc (delete): Make weak.
* libsupc++/delete_opvnt.cc (delete): Make weak.

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

Daily bump.

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

Daily bump.

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

[gcc/ChangeLog]
2004-10-25  David Ayers  <d.ayers@inode.at>

* c-common.h: Remove RID_ID.
* c-parse.in: Remove OBJECTNAME and references to RID_ID.
(typespec_reserved_attr): Add rule for TYPENAME
non_empty_protocolrefs.
(yylexname): Remove special handling of RID_ID.

[gcc/objc/ChangeLog]
2004-10-25  Ziemowit Laski  <zlaski@apple.com>
    David Ayers  <d.ayers@inode.at>

* objc-act.c (objc_comptypes): Use IS_PROTOCOL_QUALIFIED_UNTYPED
instead of IS_PROTOCOL_QUALIFIED_ID; add comparisons for:
'Class <Protocol> != id <Protocol>'; 'Class <Protocol> != <class> *';
'Class <Protocol> == id' and 'Class <Protocol> == Class'.
(objc_is_id): Add test for 'super'.
(objc_finish_message_expr): Allow for messaging of 'Class <Proto>'
receivers; if class methods are not found in protocol lists, search
for instance methods therein and warn if one is found.  Look in
global hash tables for suitable method as a last resort when messaging
'id <Proto>', 'Class <Proto>' and invalid receiver types.
(objc_add_method): Insert instance methods listed in protocols into
the global class method hash table.
* objc-act.h (IS_PROTOCOL_QUALIFIED_ID): Rename to
IS_PROTOCOL_QUALIFIED_UNTYPED and allow for 'Class <Proto>' in
addition to 'id <Proto>'.

[gcc/testsuite/ChangeLog]
2004-10-25  David Ayers  <d.ayers@inode.at>
    Ziemowit Laski  <zlaski@apple.com>

* objc.dg/call-super-2.m: Add messages to 'Class <Proto>'; update
diagnostics when messaging 'id <Proto>'.
* objc.dg/class-protocol-1.m: New test.
* objc.dg/desig-init-1.m: Add message to an invalid receiver using
a non-existent method signature.
* objc.dg/method-5.m, objc.dg/method-6.m, objc.dg/proto-hier-1.m:
Update diagnostics when messaging with non-existent method signature.
* objc.dg/proto-hier-2.m: Adjust wording of diagnostic.
* objc.dg/proto-lossage-1.m, objc.dg/proto-lossage-4.m: Messages to
invalid receivers are now resolved as if messaging 'id'; remove
extraneous diagnostics.

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

Fix -fcrossjumping doc bug.
* doc/invoke.texi (-fcrossjumping): Not enabled at -O.

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

PR c/16667
* c-parse.in (array_designator): New.
(designator): Use it.
(initelt): Only permit array_designator without '=', not ".foo".

testsuite:
* gcc.dg/init-desig-obs-1.c, gcc.dg/init-desig-obs-2.c,
gcc.dg/init-desig-obs-3.c: New tests.

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

patch to remove the analysis of module level static variables.

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

* cfg.c (unchecked_make_edge, redirect_edge_succ,
redirect_edge_pred): Use VEC_safe_push instead of
VEC_safe_insert.
* cfgrtl.c (force_nonfallthru_and_redirect): Likewise.

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

* cfgloopmanip.c (loopify): Take two more arguments true_edge
and false_edge.
* cfgloop.h: Adjust the corresponding prototype.
* loop-unswitch.c (unswitch_loop): Adjust a call to loopify.
* tree-ssa-loop-manip.c (tree_ssa_loop_version): Likewise.

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

* dwarf2out.c (rtl_for_decl_location): Avoid segfault if
DECL_INCOMING_RTL is NULL.

* gcc.dg/debug/20041023-1.c: New test.

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

* timevar.def (TV_FIND_REFERENCED_VARS): New.
* tree-dfa.c (pass_referenced_var): Use it.

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

2004-10-25  Benjamin Kosnik  <bkoz@redhat.com>

* testsuite/Makefile.am (GLIBCXX_INCLUDES): Add.
(AUTOMAKE_OPTIONS): Add nostdinc.
* testsuite/Makefile.in: Regenerate.
* scripts/testsuite_flags.in (build-includes): Remove redundant
search for libsupc++.
* fragment.am: Clean.

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

2004-10-25  Benjamin Kosnik  <bkoz@redhat.com>

* include/Makefile.am (tr1_headers): Add tuple.
* include/Makefile.in: Regenerate.

2004-10-25  Chris Jefferson  <chris@bubblescope.net>

        * include/tr1/tuple: Implementation of tuple from library TR.
* testsuite/tr1/6_containers/tuple/tuple_element.cc: New.
* testsuite/tr1/6_containers/tuple/tuple_size.cc: New.
* testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc:
New.
* testsuite/tr1/6_containers/tuple/cons/assignment.cc: New.
* testsuite/tr1/6_containers/tuple/cons/big_tuples.cc: New.
* testsuite/tr1/6_containers/tuple/cons/constructor.cc: New.
* testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc:
New.
* testsuite/tr1/6_containers/tuple/creation_functions/tie.cc: New.
* testsuite/tr1/6_containers/tuple/element_access/get.cc: New.

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

* cse.c: Change encoding of quantity numbers to avoid undefined
pointer arithmetic on qty_table.
(REGNO_QTY_VALID_P): A quantity is now valid if it isn't negative.
(get_cse_reg_info): Initialize reg_qty to a unique negative value.
(new_basic_block): Assign "real" quantity numbers from zero.
(delete_reg_equiv): Do nothing if quantity is invalid.  Reset the
REG_QTY to its unique negative value.
(merge_equiv_classes): Calculate need_rehash if quantity is valid.
(cse_main): Don't include max_reg when determining max_qty.
(cse_basic_block): Avoid subtracting a large offset from qty_table,
which causes undefined C99 behaviour.  Only allocate needed memory.

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

* java/util/ResourceBundle.java (tryBundle): Use
Class.isAssignableFrom rather than catching ClassCastException.

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

* gnu/java/text/WordBreakIterator.java (WordBreakIterator): Don't
initialize `iter'.
* gnu/java/text/SentenceBreakIterator.java
(SentenceBreakIterator): Don't initialize `iter'.
* gnu/java/text/LineBreakIterator.java (LineBreakIterator): Don't
initialize `iter'.
* gnu/java/text/CharacterBreakIterator.java
(CharacterBreakIterator): Don't initialize `iter'.
* gnu/java/text/BaseBreakIterator.java (BaseBreakIterator): New
constructor.
* java/text/BreakIterator.java: Updated documentation.

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

* stmt.c (expand_case): Remove an obsolete comment.

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

2004-10-25  Paolo Carlini  <pcarlini@suse.de>

* include/bits/basic_string.h (_Rep::_M_is_safe): Move to
basic_string as _M_disjunct, adjust to take only __s.
* include/bits/basic_string.tcc: Adjust consistently callers.

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

2004-10-25  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/17407
        * c-decl.c (grokdeclarator) <case cdk_array>: Remove the call
        layout_type as it is already done by build_array_type.
        * tree.c (build_array_type): Layout the type even

2004-10-25  Andrew Pinski  <pinskia@physics.uc.edu>

        PR c++/18121
        * decl.c (grokdeclarator) <case cdk_array>: Remove the call
        layout_type as it is already done by create_array_type_for_decl.

2004-10-25  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/17407
        * gcc.c-torture/compile/pr17407.c: New test.

        PR c++/18121
        * g++.dg/template/array8.C: New test.

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

2004-10-25  Paolo Carlini  <pcarlini@suse.de>

* include/bits/basic_string.tcc (assign(const _CharT*, size_type)):
Adjust bit missing from the previous commit.

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

gcc/testsuite:
PR other/18138
* lib/g++.exp: Accept more than one multilib libgcc.
* lib/gcc-dg.exp: Likewise.
* lib/objc.exp: Likewise.
* lib/treelang.exp: Likewise.
* lib/gfortran.exp: Likewise.

libffi:
PR other/18138
* testsuite/lib/libffi-dg.exp: Accept more than one multilib
libgcc.

libjava:
PR other/18138
* testsuite/lib/libjava.exp: Accept more than one multilib
libgcc.

libmudflap!:
PR other/18138
* testsuite/lib/libmudflap.exp: Accept more than one multilib
libgcc.

libstdc++-v3:
PR other/18138
* testsuite/lib/libstdc++.exp: Accept more than one multilib
libgcc.

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

(FFII_CLOSURES): Set to 0.

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

2004-10-25  Paolo Carlini  <pcarlini@suse.de>

* include/bits/basic_string.h (_Rep::_M_is_safe, _M_check_length,
_M_move, _M_copy, _M_assign): New, use througout.
(operator+=(_CharT)): Define in terms of push_back.
(append(const basic_string&)): Define here, inline, and simplify,
don't use the full _M_replace_safe.
(append(size_type, _CharT)): Likewise, don't use _M_replace_aux.
(push_back): Likewise.
(assign(const basic_string&)): Define here, inline.
* include/bits/basic_string.tcc (append(const _CharT* s, size_type):
Fix: when s points inside the _Rep, upon reallocation (reserve) we
were copying from deallocated memory.
(append(const basic_string&, size_type, size_type)): Simplify,
don't use _M_replace_safe.
(replace(size_type, size_type, const _CharT*, size_type)): Slightly
tweak.
(reserve): Likewise.
* testsuite/21_strings/basic_string/append/char/2.cc: New.
* testsuite/21_strings/basic_string/append/char/3.cc: Likewise.
* testsuite/21_strings/basic_string/append/wchar_t/2.cc: Likewise.
* testsuite/21_strings/basic_string/append/wchar_t/3.cc: Likewise.

* testsuite/21_strings/basic_string/assign/char/3.cc: Remove junk.
* testsuite/21_strings/basic_string/assign/wchar_t/3.cc: Likewise.

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

* config/frv/linux.h (TARGET_C99_FUNCTIONS): Define to 0.

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

* config/frv/frv.md (movdi, movdf): Handle wide-constant splits
with wider-than-32-bit HOST_WIDE_INTs.

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

2004-10-25  David Billinghurst <David.Billinghurst@riotinto.com

* config/mips/mips.c(mips_output_filename): Remove unused
array ltext_label_name

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

* cfgcleanup.c (outgoing_edges_match): Fix typo in dump output.

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

2004-10-24  James A. Morrison  <phython@gcc.gnu.org>

        * treetree.c (tree_code_generate_return): Wrap param declaration in
        ENABLE_CHECKING.

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

* config/rs6000/darwin.h (BLOCK_REG_PADDING): Define.

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

* cfgcleanup.c (outgoing_edges_match): Fix typo in dump output.

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

* gcc.dg/c90-const-expr-3.c: Reference the ISO C standard.

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

Daily bump.

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

Daily bump.

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

Correct e-mail address on last change.

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

* gcc.dg/c90-const-expr-3.c: xfail all the ASSERT_NOT_NPC tests.
* gcc.dg/c99-const-expr-3.c: Likewise.

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

2004-10-23  Andrew Pinski  <pinskia@physics.uc.edu>

        * predict.c (predict_loops): Call scev_finalize instead of
        scev_reset.

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

* config/dbxcoff.h, config/dbxelf.h, config/libgloss.h,
config/openbsd.h, config/mips/r3900.h, config/pdp11/pdp11.md,
config/sh/ushmedia.h, config/sparc/elf.h,
config/sparc/sp64-elf.h: Update copyright.

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

* stmt.c (expand_case): Handle the default label outside of
the for loop.  Remove code to handle a missing default label.

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

Daily bump.

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

* dbxout.c (dbxout_function_decl): Don't use
DBX_OUTPUT_FUNCTION_END.
* system.h: Poison DBX_OUTPUT_FUNCTION_END.
* doc/tm.texi (DBX_OUTPUT_FUNCTION_END): Remove.

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

* configure.in: Use an absolute path to install-sh.
* configure: Regenerated.

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

2004-10-23  Michael Koch  <konqueror@gmx.de>

* javax/print/DocFlavor.java,
javax/print/attribute/standard/JobStateReason.java,
javax/print/attribute/standard/MultipleDocumentHandling.java:
Added missing constants.

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

2004-10-23  Andrew Pinski  <pinskia@physics.uc.edu>

        * testsuite/ext/mt_allocator/deallocate_global-2.c:
        s/value_t/value_type/. s/traits_t/traits_type/.
        s/policy_t/policy_type/. s/allocator_t/allocator_type/.
        s/string_t/string_type/. s/list_t/list_type/.
        * testsuite/ext/mt_allocator/deallocate_global-4.cc: Likewise.
        * testsuite/ext/mt_allocator/deallocate_global_thread-1.cc: Likewise.
        * testsuite/ext/mt_allocator/deallocate_global_thread-3.cc: Likewise.
        * testsuite/ext/mt_allocator/deallocate_local-2.cc: Likewise.
        * testsuite/ext/mt_allocator/deallocate_local-4.cc: Likewise.
        * testsuite/ext/mt_allocator/deallocate_local_thread-1.cc: Likewise.
        * testsuite/ext/mt_allocator/deallocate_local_thread-3.cc: Likewise.

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

2004-10-23  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/17967
        * tree-cfg.c (remove_usless_stmts_cond):  Don't Fold statement.

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

2004-10-23  Daniel Berlin  <dberlin@dberlin.org>

* tree-ssa-dom.c (record_equality): Use loop depth to determine
which way to record the equality as well.
(loop_depth_of_name): New function.

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

2004-10-23  Andrew Pinski  <pinskia@physics.uc.edu>.

        * gcc.dg/tree-ssa/loop-1.c: Add -static for *-*-darwin*.

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

PR middle-end/17793
* gimplify.c (gimplify_addr_expr) <VIEW_CONVERT_EXPR>: Look
through the operand if it is a useless type conversion.

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

Ignore autom4te.cache

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

Daily bump.

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

Daily bump.

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

* cfg.c (remove_edge): Use VEC_unordered_remove.
(redirect_edge_succ): Likewise.
(redirect_edge_pred): Likewise.
* cfgrtl.c (force_nonfallthru_and_redirect): Likewise.

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

* gcc.c-torture/execute/loop-2e.x: Remove.

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

* gnu/java/net/protocol/http/Connection.java (sendRequest): Fix
typo.

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

2004-10-22  Michael Koch  <konqueror@gmx.de>

PR libjava/14009
* gnu/java/net/protocol/http/Connection.java
(sendRequest): Handle case when url.getFile() returns an empty string.

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

* sbitmap.h (EXECUTE_IF_SET_IN_SBITMAP): Don't access PTR
beyond its end.

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

2004-10-22  Eric Christopher  <echristo@redhat.com>

        * config/rs6000/rs6000.c (setup_incoming_varargs): Align DFmode
saves.

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

* config/rs6000/spe.md (spe_extendsfdf2): New.
(movdf_e500_double): New.
(spe_truncdfsf2): New.
(spe_absdf2): New.
(spe_nabsdf2): New.
(spe_negdf2): New.
(sub_adddf3): New.
(spe_subdf3): New.
(spe_muldf3): New.
(spe_floatsidf2): New.
(spe_floatunssidf2): New.
(fix_truncdfsi2): New.
(spe_fixuns_truncdfsi2): New.

* config/rs6000/rs6000.md (truncdfsf2): Change to expander.
(fpr_truncdfsf2): New.
(negdf2): Change to expander.
(fpr_negdf2): New.
(fpr_nabsdf2): Name pattern.
(adddf3): Change to expander.
(fpr_adddf3): Nem.
(subdf3): Change to expander.
(fpr_subdf3): New.
(muldf3): Change to expander.
(fpr_muldf3): New.
(divdf3): Change to expander.
(fpr_divdf3): New.
(movdf_softfloat32): Change !TARGET_FPRS to TARGET_E500_SINGLE.
(cmpdf): Allow for TARGET_E500_DOUBLE.

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

* c-semantics.c (re_push_stmt_list): Remove.
* c-common.h: Remove the corresponding prototype.

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

* stmt.c (asm_op_is_mem_input): Remove.
* tree.h: Remove the corresponding prototype.

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

* tree-gimple.c (is_gimple_constructor_elt): Remove.
* tree-gimple.h: Remove the corresponding prototype.

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

* varasm.c (get_pool_mode_for_function, get_pool_offset):
Remove.
* rtl.h: Remove the corresponding prototypes.

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

* tree-cfg.c (thread_jumps_from_bb): Speed up by extracting
edge information when we commit ourselves to threading a
particular jump.

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

* tree-cfg.c (thread_jumps): Speed up by putting basic blocks
into worklist instead of their indexes.

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

Fixed ChangeLog entry of my last commit.

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

2004-10-22  Michael Koch  <konqueror@gmx.de>

* java/lang/Math.java
* java/lang/StackTraceElement.java
* java/nio/Buffer.java
* java/nio/ByteBuffer.java
* java/nio/CharBuffer.java
* java/nio/DoubleBuffer.java
* java/nio/FloatBuffer.java
* java/nio/IntBuffer.java
* java/nio/LongBuffer.java
* java/nio/ShortBuffer.java
* java/nio/charset/Charset.java
* java/rmi/server/RMIClassLoader.java
* java/rmi/server/RMISocketFactory.java
* java/security/Policy.java
* java/text/ChoiceFormat.java
* java/text/CollationElementIterator.java
* java/text/DateFormat.java
* java/text/DecimalFormat.java
* java/text/DecimalFormatSymbols.java
* java/text/MessageFormat.java
* java/text/NumberFormat.java
* java/text/RuleBasedCollator.java
* java/text/SimpleDateFormat.java
* java/util/BitSet.java
* java/util/Calendar.java
* java/util/Collections.java
* java/util/IdentityHashMap.java
* java/util/Locale.java
* java/util/TreeMap.java
* java/util/logging/LogRecord.java
* java/util/logging/XMLFormatter.java
* java/util/prefs/AbstractPreferences.java
* java/util/prefs/Preferences.java
* javax/crypto/interfaces/DHPrivateKey.java
* javax/crypto/interfaces/DHPublicKey.java
* javax/crypto/interfaces/PBEKey.java
* javax/net/ssl/HandshakeCompletedEvent.java
* javax/security/auth/Subject.java

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

* alias.c, basic-block.h, cgraphunit.c, combine.c, domwalk.h,
final.c, gengtype.c, genpreds.c, ggc-page.c, insn-notes.def,
lambda-code.c, loop-unroll.c, modulo-sched.c, pointer-set.c,
pretty-print.c, ra-colorize.c, sbitmap.c, tree-complex.c,
tree-data-ref.c, tree-dfa.c, tree-inline.c, tree-into-ssa.c,
tree-scalar-evolution.c, tree-ssa-dom.c,
tree-ssa-loop-manip.c, tree-ssa-loop-niter.c,
tree-ssa-phiopt.c, tree-ssa-pre.c, tree-ssa-threadupdate.c,
tree-vectorizer.c, vec.h: Fix comment formatting.

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

* gnu/java/net/natPlainSocketImplPosix.cc
(gnu::java::net::PlainSocketImpl::available): Call FIONREAD ioctl
with 'int *' argument instead of 'long *'.

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

* dwarf.h, gthr-dce.h, gthr-single.h, gthr-solaris.h, gthr.h,
libfuncs.h, libgcc2.h, stab.def, tsystem.h: Update copyright.

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

PR java/17265
* class.c (make_local_function_alias): Revert 2004-08-18 change.
(make_method_value): Likewise.

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

* config/ptx4.h, config/mcore/mcore-pe.h,
config/rs6000/eabi.h, config/vax/elf.h: Update copyright.

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

* config/m68k/m68k.h (HARD_REGNO_RENAME_OK): New macro.
* config/m68k/m68k.c (m68k_hard regno_rename_ok): Disallow
renaming of non-live registers in interrupt functions.
* config/m68k/m68k-protos.h (m68k_hard_regno_rename_ok): Add prototype.

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