571059 - build warnings about %08x and 'long long unsigned int', now that nsFrameState is 64-bit

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Daniel Holbert [:dholbert]]

There are at least 8 places in frame code where we have e.g.
>   fprintf(out, " [state=%08x]", mState);

Now that mState is a 64-bit value (due to bug 570837), these printf/fprintf lines spam build warnings about type mismatch.  We just need a s/x/llx/ on those lines, so that (f)printf will be expecting a long-long to print as hex.

The instances of this that I found are:
{
> layout/generic/nsBlockFrame.cpp:401: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long long unsigned int’
> layout/generic/nsContainerFrame.cpp:1544: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long long unsigned int’
> layout/generic/nsFrame.cpp:4144: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long long unsigned int’
> layout/generic/nsImageFrame.cpp:1595: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long long unsigned int’
> layout/generic/nsPlaceholderFrame.cpp:243: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long long unsigned int’
> layout/generic/nsTextFrameThebes.cpp:6939: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long long unsigned int’
> layout/generic/nsTextFrameThebes.cpp:6941: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long long unsigned int’
> layout/xul/base/src/nsPopupSetFrame.cpp:210: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long long unsigned int’
}

Attaching patch in a minute.

Comment 1

[Daniel Holbert [:dholbert]]

Attachment: fix

This just does a s/%08x/%016llx/ on the affected lines.

(16 --> padding to the full 16-character potential width of the now-64-bit value, so that everything will still line up nicely in debug output)

Comment 2

[Daniel Holbert [:dholbert]]

Ah, just noticed one more instance of this problem with a slightly different warning message:
> layout/generic/nsFrame.cpp:4361: warning: format '%d' expects type 'int', but argument 3 has type 'nsFrameState'

I'll post a new patch that covers that one, too. (there aren't any other instances of that particular warning -- that's the only line in a full debug buildlog to mention nsFrameState)

Comment 3

[Daniel Holbert [:dholbert]]

Attachment: fix v2

Comment 4

[David Baron :dbaron: (⌚️UTC-5, no longer working on Mozilla)]

Comment on attachment 450285 [details] [diff] [review]
fix v2

r=dbaron

Comment 5

[Daniel Holbert [:dholbert]]

http://hg.mozilla.org/mozilla-central/rev/792cd3e8aa59