[Bug c++/46221] New: huge number of c++ testsuite failures, libstdc++.so alias missing

[Bug c++/46221] New: huge number of c++ testsuite failures, libstdc++.so alias missing

[amodra at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

           Summary: huge number of c++ testsuite failures, libstdc++.so
                    alias missing
           Product: gcc
           Version: 4.6.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: c++
        AssignedTo: unassigned@gcc.gnu.org
        ReportedBy: amodra@gmail.com


Created attachment 22196
  --> http://gcc.gnu.org/bugzilla/attachment.cgi?id=22196
preprocessed source

Current mainline miscompiles locale-inst.cc, resulting in most c++ tests
complaining
/home/alan/build/ppc/gcc-curr/powerpc-linux/./libstdc++-v3/src/.libs/libstdc++.so:
undefined reference to `std::ostreambuf_iterator<wchar_t,
std::char_traits<wchar_t> > std::num_put<wchar_t,
std::ostreambuf_iterator<wchar_t, std::char_traits<wchar_t> >
>::_M_insert_float<long double>(std::ostreambuf_iterator<wchar_t,
std::char_traits<wchar_t> >, std::ios_base&, wchar_t, char, long double) const'

Ah, I thought, long double compat missing, but _GLIBCXX_LONG_DOUBLE_COMPAT is
defined, and preprocessed locale-inst.cc shows the alias is there

extern "C" void
_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIeEES3_S3_RSt8ios_baseccT_
(void) __attribute__ ((alias
("_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIdEES3_S3_RSt8ios_baseccT_"),
weak))

but, no sign of it in the assembly output.

[Bug c++/46221] huge number of c++ testsuite failures, libstdc++.so alias missing

[amodra at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #1 from Alan Modra <amodra at gmail dot com> 2010-10-29 05:38:59 UTC ---
Created attachment 22197
  --> http://gcc.gnu.org/bugzilla/attachment.cgi?id=22197
locale-inst.s 20101028

[Bug c++/46221] huge number of c++ testsuite failures, libstdc++.so alias missing

[amodra at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #2 from Alan Modra <amodra at gmail dot com> 2010-10-29 05:40:02 UTC ---
Created attachment 22198
  --> http://gcc.gnu.org/bugzilla/attachment.cgi?id=22198
locale-inst.s 20101014

[Bug c++/46221] huge number of c++ testsuite failures, libstdc++.so alias missing

[amodra at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #3 from Alan Modra <amodra at gmail dot com> 2010-10-29 13:01:34 UTC ---
I poked at this a little today.  remove_unreachable_alias_pairs prunes the
alias_pair we need for some reason.  I don't know my way around the cgraph code
well enough to figure out why..

Incidentally, it is possible to compile the .ii file attached to this bug with
a current x86 g++ and observe the missing alias.

[Bug c++/46221] huge number of c++ testsuite failures, libstdc++.so alias missing

[amodra at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #4 from Alan Modra <amodra at gmail dot com> 2010-10-30 04:37:38 UTC ---
The one thing that makes the missing alias different from other aliases is that
its target is itself an alias.  Hmm, that suggests a reduced C testcase might
be easy.

[Bug c++/46221] huge number of c++ testsuite failures, libstdc++.so alias missing

[amodra at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #5 from Alan Modra <amodra at gmail dot com> 2010-10-30 04:41:54 UTC ---
Created attachment 22203
  --> http://gcc.gnu.org/bugzilla/attachment.cgi?id=22203
aliases.i reduced C testcase

This reduced testcase shows lack of "wobbly" alias when compiled with gcc -O.

[Bug c++/46221] huge number of c++ testsuite failures, libstdc++.so alias missing

[amodra at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Alan Modra <amodra at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |hubicka at gcc dot gnu.org

--- Comment #6 from Alan Modra <amodra at gmail dot com> 2010-10-30 08:35:46 UTC ---
My regression hunt identified revision 165990
http://gcc.gnu.org/ml/gcc-patches/2010-10/msg02275.html

[Bug c++/46221] huge number of c++ testsuite failures, libstdc++.so alias missing

[meissner at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Michael Meissner <meissner at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Priority|P3                          |P1
             Status|UNCONFIRMED                 |NEW
   Last reconfirmed|                            |2010.11.01 19:20:37
                 CC|                            |meissner at gcc dot gnu.org
     Ever Confirmed|0                           |1
           Severity|normal                      |blocker

--- Comment #7 from Michael Meissner <meissner at gcc dot gnu.org> 2010-11-01 19:20:37 UTC ---
This is a blocker for powerpc64-linux.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Richard Guenther <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|c++                         |middle-end
   Target Milestone|---                         |4.6.0
            Summary|huge number of c++          |[4.6 Regression] huge
                   |testsuite failures,         |number of c++ testsuite
                   |libstdc++.so alias missing  |failures, libstdc++.so
                   |                            |alias missing

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Richard Guenther <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Target|powerpc-linux               |powerpc-linux, i?86-linux

--- Comment #8 from Richard Guenther <rguenth at gcc dot gnu.org> 2010-11-03 21:37:19 UTC ---
Also broken on i?86-linux.

        .text
        .globl  dessert
        .type   dessert, @function
dessert:
.LFB0:
        addl    $1, yum
        ret
.LFE0:
        .size   dessert, .-dessert
        .comm   yum,4,4
        .weak   jelly
        .set    jelly,dessert

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[ubizjak at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Uros Bizjak <ubizjak at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |ubizjak at gmail dot com

--- Comment #9 from Uros Bizjak <ubizjak at gmail dot com> 2010-11-06 07:44:19 UTC ---
This also fails on alpha-pc-linux-gnu.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Richard Guenther <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |rguenth at gcc dot gnu.org

--- Comment #10 from Richard Guenther <rguenth at gcc dot gnu.org> 2010-11-08 11:54:21 UTC ---
*** Bug 46359 has been marked as a duplicate of this bug. ***

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #11 from Richard Guenther <rguenth at gcc dot gnu.org> 2010-11-08 12:03:23 UTC ---
I will investigate this a bit now.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Richard Guenther <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED
         AssignedTo|unassigned at gcc dot       |rguenth at gcc dot gnu.org
                   |gnu.org                     |

--- Comment #12 from Richard Guenther <rguenth at gcc dot gnu.org> 2010-11-08 13:32:24 UTC ---
The first issue I see is that we reclaim the cgraph nodes that constitute
aliases (even though they are TREE_PUBLIC):

Reclaiming functions: wobbly jelly

The 2nd issue is that in remove_unreachable_alias_pairs we remove pairs
for decls that are !DECL_EXTERNAL (huh, I supposed that's to be for _targets_
that are not external!).

As we have reclaimed jelly, the target for wobbly isn't available and
thus we remove the alias.

Now, alias-pairs are indeed a complete mess and need to be re-done
properly integrated with cgraph/varpool and ipa-references.

I have a ha^Wpatch that makes us emit instead

> ./cc1 -quiet t.c -O -fdump-ipa-all-details
t.c:4:13: error: 'wobbly' aliased to undefined symbol 'jelly'

haha, because find_decl_and_mark_needed is stupid as well.  Bah.  We really
need to avoid throwing away the cgraph node.

But the cgraph code is messy^2 as well.  Bah.

I have a pa^Whack.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #13 from Richard Guenther <rguenth at gcc dot gnu.org> 2010-11-08 14:18:29 UTC ---
Created attachment 22323
  --> http://gcc.gnu.org/bugzilla/attachment.cgi?id=22323
patch

Patch.  Testing on x86_64-linux, testing elsewhere is appreciated.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[bergner at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #14 from Peter Bergner <bergner at gcc dot gnu.org> 2010-11-08 14:36:32 UTC ---
I'll give it a spin on powerpc64-linux.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[hubicka at ucw dot cz]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #15 from Jan Hubicka <hubicka at ucw dot cz> 2010-11-08 20:12:43 UTC ---
> 
> But the cgraph code is messy^2 as well.  Bah.
Thanks for working on this.  Have at least rewrite of this unreachable function
removal pass
in queue for next stage1;)

Honza

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[ubizjak at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #16 from Uros Bizjak <ubizjak at gmail dot com> 2010-11-08 22:20:12 UTC ---
(In reply to comment #13)

> Patch.  Testing on x86_64-linux, testing elsewhere is appreciated.

Works OK on alphaev68-unknown-linux-gnu:

Running target unix
FAIL: 22_locale/collate/hash/char/wrapped_env.cc execution test
FAIL: 22_locale/collate_byname/named_equivalence.cc execution test
FAIL: 22_locale/ctype/is/char/2.cc execution test
FAIL: 22_locale/ctype/is/char/wrapped_env.cc execution test

        === libstdc++ Summary ===

# of expected passes        7526
# of unexpected failures    4
# of expected failures        83
# of unsupported tests        298

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[bergner at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #17 from Peter Bergner <bergner at gcc dot gnu.org> 2010-11-09 01:50:48 UTC ---
The patch looks good on powerpc64-linux.

                === libstdc++ Summary ===

# of expected passes            16234
# of expected failures          170
# of unsupported tests          200

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Richard Guenther <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|                            |FIXED

--- Comment #19 from Richard Guenther <rguenth at gcc dot gnu.org> 2010-11-09 10:36:57 UTC ---
Fixed.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #18 from Richard Guenther <rguenth at gcc dot gnu.org> 2010-11-09 10:36:30 UTC ---
Author: rguenth
Date: Tue Nov  9 10:36:24 2010
New Revision: 166479

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=166479
Log:
2010-11-09  Richard Guenther  <rguenther@suse.de>

    PR middle-end/46221
    * varasm.c (compute_visible_aliases): New function.
    (remove_unreachable_alias_pairs): Aliases make a target available
    even though we reclaimed the cgraph node.
    (finish_aliases_1): Likewise.
    * Makefile.in (varasm.o): Add pointer-set.h dependency.

    * gcc.target/i386/alias-1.c: New testcase.

Added:
    trunk/gcc/testsuite/gcc.target/i386/alias-1.c
Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/Makefile.in
    trunk/gcc/testsuite/ChangeLog
    trunk/gcc/varasm.c

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[howarth at nitro dot med.uc.edu]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Jack Howarth <howarth at nitro dot med.uc.edu> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |howarth at nitro dot
                   |                            |med.uc.edu

--- Comment #20 from Jack Howarth <howarth at nitro dot med.uc.edu> 2010-11-10 05:12:10 UTC ---
The new gcc.target/i386/alias-1.c testcase produces...

FAIL: gcc.target/i386/alias-1.c (test for excess errors)
FAIL: gcc.target/i386/alias-1.c scan-assembler wobbly
FAIL: gcc.target/i386/alias-1.c scan-assembler jelly

at -m32 on x86_64-apple-darwin10 with errors of the form...

Executing on host: /sw/src/fink.build/gcc46-4.6.0-1000/darwin_objdir/gcc/xgcc
-B/sw/src/fink.build/gcc46-4.6.0-1000/darwin_objdir/gcc/
/sw/src/fink.build/gcc46-4.6.0-1000/gcc-4.6-20101109/gcc/testsuite/gcc.target/i386/alias-1.c
   -ansi -pedantic-errors -S  -m32 -o alias-1.s    (timeout = 300)
/sw/src/fink.build/gcc46-4.6.0-1000/gcc-4.6-20101109/gcc/testsuite/gcc.target/i386/alias-1.c:6:1:
warning: alias definitions not supported in Mach-O; ignored [enabled by
default]^M

Shouldn't this testcase contain...

/* { dg-require-alias "" } */

which will convert it to an unsupported test as was done for
gcc.dg/lto/20081222_0.c on darwin?

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenther at suse dot de]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #21 from rguenther at suse dot de <rguenther at suse dot de> 2010-11-10 10:25:51 UTC ---
On Wed, 10 Nov 2010, howarth at nitro dot med.uc.edu wrote:

> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221
> 
> Jack Howarth <howarth at nitro dot med.uc.edu> changed:
> 
>            What    |Removed                     |Added
> ----------------------------------------------------------------------------
>                  CC|                            |howarth at nitro dot
>                    |                            |med.uc.edu
> 
> --- Comment #20 from Jack Howarth <howarth at nitro dot med.uc.edu> 2010-11-10 05:12:10 UTC ---
> The new gcc.target/i386/alias-1.c testcase produces...
> 
> FAIL: gcc.target/i386/alias-1.c (test for excess errors)
> FAIL: gcc.target/i386/alias-1.c scan-assembler wobbly
> FAIL: gcc.target/i386/alias-1.c scan-assembler jelly
> 
> at -m32 on x86_64-apple-darwin10 with errors of the form...
> 
> Executing on host: /sw/src/fink.build/gcc46-4.6.0-1000/darwin_objdir/gcc/xgcc
> -B/sw/src/fink.build/gcc46-4.6.0-1000/darwin_objdir/gcc/
> /sw/src/fink.build/gcc46-4.6.0-1000/gcc-4.6-20101109/gcc/testsuite/gcc.target/i386/alias-1.c
>    -ansi -pedantic-errors -S  -m32 -o alias-1.s    (timeout = 300)
> /sw/src/fink.build/gcc46-4.6.0-1000/gcc-4.6-20101109/gcc/testsuite/gcc.target/i386/alias-1.c:6:1:
> warning: alias definitions not supported in Mach-O; ignored [enabled by
> default]^M
> 
> Shouldn't this testcase contain...
> 
> /* { dg-require-alias "" } */
> 
> which will convert it to an unsupported test as was done for
> gcc.dg/lto/20081222_0.c on darwin?

Feel free to do it, I tend to forget such details.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[bergner at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #22 from Peter Bergner <bergner at gcc dot gnu.org> 2010-11-10 13:31:42 UTC ---
Is there a reason why the test case is an i386 only test case?  Given it's
known to fail on powerpc*-linux and alpha-linux, it should probably be a arch
independent test case.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[rguenther at suse dot de]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #23 from rguenther at suse dot de <rguenther at suse dot de> 2010-11-10 13:39:26 UTC ---
On Wed, 10 Nov 2010, bergner at gcc dot gnu.org wrote:

> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221
> 
> --- Comment #22 from Peter Bergner <bergner at gcc dot gnu.org> 2010-11-10 13:31:42 UTC ---
> Is there a reason why the test case is an i386 only test case?  Given it's
> known to fail on powerpc*-linux and alpha-linux, it should probably be a arch
> independent test case.

scanning asms is always fragile

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[bergner at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #24 from Peter Bergner <bergner at gcc dot gnu.org> 2010-11-10 13:57:29 UTC ---
Agreed, but in this case, since we're just looking for the symbol names, I
think it should work.  If we were to try and create a ppc specific test, I
can't see how it would be different.  Anyway, I won't press this if you want to
leave it where it is.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[pinskia at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Andrew Pinski <pinskia at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jiez at gcc dot gnu.org

--- Comment #25 from Andrew Pinski <pinskia at gcc dot gnu.org> 2010-11-27 18:19:55 UTC ---
*** Bug 46674 has been marked as a duplicate of this bug. ***

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[davek at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Dave Korn <davek at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Target|powerpc-linux, i?86-linux,  |powerpc-linux, i?86-linux,
                   |alpha-linux                 |alpha-linux, i?86-pc-cygwin
             Status|RESOLVED                    |REOPENED
                 CC|                            |davek at gcc dot gnu.org
         Depends on|                            |46674
         Resolution|FIXED                       |
         AssignedTo|rguenth at gcc dot gnu.org  |davek at gcc dot gnu.org

--- Comment #26 from Dave Korn <davek at gcc dot gnu.org> 2010-12-15 16:28:12 UTC ---
(In reply to comment #25)
> *** Bug 46674 has been marked as a duplicate of this bug. ***

Actually, it's a genuine bug in the patch; it ends up comparing C identifiers
to actual assembler names, which works fine when there's no USER_LABEL_PREFIX
and when none of the nodes in question have __asm("..") names, but runs into
problems if/when there is/they do.

See attachment 22765 for the patch to resolve all this by always using
assembler names.  Bootstraps and testruns are under way.

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[davek at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

--- Comment #27 from Dave Korn <davek at gcc dot gnu.org> 2010-12-19 11:14:23 UTC ---
Author: davek
Date: Sun Dec 19 11:14:19 2010
New Revision: 168047

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=168047
Log:
    PR middle-end/46674
    PR middle-end/46221
    * varasm.c (symbol_alias_set_t): New typedef for derived pointer_set
    wrapper class.
    (symbol_alias_set_create): New wrapper function.
    (symbol_alias_set_destroy): Likewise.
    (symbol_alias_set_contains): Likewise.
    (symbol_alias_set_insert): Likewise.
    (compute_visible_aliases): Use the above and return symbol_alias_set_t,
    not a pointer_set.
    (remove_unreachable_alias_pairs): Adjust likewise to match.
    (finish_aliases_1): Likewise.


Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/varasm.c

[Bug middle-end/46221] [4.6 Regression] huge number of c++ testsuite failures, libstdc++.so alias missing

[davek at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46221

Dave Korn <davek at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|REOPENED                    |RESOLVED
         Resolution|                            |FIXED

--- Comment #28 from Dave Korn <davek at gcc dot gnu.org> 2010-12-19 11:18:37 UTC ---
Problems (PR46674) with this fix now resolved.