1121488 - port changes from bug 1120476 and bug 1121304 to comm-central

Status: RESOLVED FIXED

(MailNews Core :: Backend, defect)

Description

[Nathan Froyd [:froydnj]]

- PL_DHashTable::data has been removed, so PL_DHashTableInit and PL_NewDHashTable calls need to be updated.
- PLDHashTableOps::finalize has been removed, so lots of definitions need to be updated (probably just sed -e /PL_DHashFinalizeStub,/d would work, if the gecko patch is any indication).

Comment 1

[Nicholas Nethercote [inactive]]

> (probably just sed -e /PL_DHashFinalizeStub,/d would work, if the gecko patch is any indication).

Some of the lines lack the trailing comma. I'd do it manually, myself, just to be safe. It's not hard.

Comment 2

[Nicholas Nethercote [inactive]]

Bug 1121304 is similar -- it removes PLDHashTableOps::{alloc,free}Table. I'll land its patches at the same time as the patches from bug 1120476 to make the comm-central updating simpler.

Comment 3

[Nicholas Nethercote [inactive]]

The patches have landed on mozilla-inbound.

Comment 4

[Joshua Cranmer [:jcranmer]]

Attachment: Port the bugs

Rather simple patch, fortunately

Comment 5

[Nicholas Nethercote [inactive]]

Comment on attachment 8549345 [details] [diff] [review]
Port the bugs

Review of attachment 8549345 [details] [diff] [review]:
-----------------------------------------------------------------

I'll give you r+ if you're happy to take it :)

Comment 6

[Kent James (:rkent)]

Comment on attachment 8549345 [details] [diff] [review]
Port the bugs

Review of attachment 8549345 [details] [diff] [review]:
-----------------------------------------------------------------

Reviewed changes, also confirmed that it compiles with the prereq patches landed in mozilla-central.

Note though that bug 1121304 was backed out, and these patches can't land until those prereq patches land.

Comment 7

[Joshua Cranmer [:jcranmer]]

https://hg.mozilla.org/comm-central/rev/7ee1e4040d49

Comment 8

[Joshua Cranmer [:jcranmer]]

I'll reland the changes need for bug 1121304 when that merges to mozilla-central, since it didn't look like that was going to happen tonight.

Comment 9

[Nicholas Nethercote [inactive]]

> Note though that bug 1121304 was backed out, and these patches can't land
> until those prereq patches land.

They just relanded without change on mozilla-inbound. Hopefully they'll stick this time.

Comment 10

[Kent James (:rkent)]

What was checked in is not what was reviewed.

From Checkin:


    1.41 @@ -721,17 +721,16 @@ nsresult nsMsgDatabase::GetHdrFromUseCac
    1.42  PLDHashTableOps nsMsgDatabase::gMsgDBHashTableOps =
    1.43  {
    1.44    PL_DHashAllocTable,
    1.45    PL_DHashFreeTable,
    1.46    HashKey,
    1.47    MatchEntry,
    1.48    MoveEntry,
    1.49    ClearEntry,
    1.50 -  PL_DHashFinalizeStub,
    1.51    nullptr
    1.52  };

From reviewed patch:

 PLDHashTableOps nsMsgDatabase::gMsgDBHashTableOps =
 {
-  PL_DHashAllocTable,
-  PL_DHashFreeTable,
   HashKey,
   MatchEntry,
   MoveEntry,
   ClearEntry,
-  PL_DHashFinalizeStub,
   nullptr
 };

and presumably elsewhere.

Comment 11

[Kent James (:rkent)]

Remainder of patch pushed https://hg.mozilla.org/comm-central/rev/c42944c42dd9