From 9135a11e8c8f0837738fd976b28d36a53fd1de27 Mon Sep 17 00:00:00 2001 From: Eric Rahm Date: Mon, 9 Apr 2018 11:01:59 -0700 Subject: Bug 1452202 - Clean up PLDHashTable move operator. r=froydnj, a=RyanVM --HG-- extra : source : 9036c64b7a66ffe93e717ca97642a4400e396d9c extra : intermediate-source : 041d1c561feb5f4d9bcd492f31f7203ca477f938 --- xpcom/glue/PLDHashTable.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xpcom') diff --git a/xpcom/glue/PLDHashTable.cpp b/xpcom/glue/PLDHashTable.cpp index 6152e9000..5e932ccb2 100644 --- a/xpcom/glue/PLDHashTable.cpp +++ b/xpcom/glue/PLDHashTable.cpp @@ -216,17 +216,17 @@ PLDHashTable::operator=(PLDHashTable&& aOther) return *this; } - // Destruct |this|. - this->~PLDHashTable(); - - // |mOps| and |mEntrySize| are const so we can't assign them. Instead, we - // require that they are equal. The justification for this is that they're + // |mOps| and |mEntrySize| are required to stay the same, they're // conceptually part of the type -- indeed, if PLDHashTable was a templated // type like nsTHashtable, they *would* be part of the type -- so it only // makes sense to assign in cases where they match. MOZ_RELEASE_ASSERT(mOps == aOther.mOps); MOZ_RELEASE_ASSERT(mEntrySize == aOther.mEntrySize); + // Reconstruct |this|. + this->~PLDHashTable(); + new (KnownNotNull, this) PLDHashTable(aOther.mOps, aOther.mEntrySize, 0); + // Move non-const pieces over. mHashShift = Move(aOther.mHashShift); mEntryCount = Move(aOther.mEntryCount); -- cgit v1.2.3 From f7edee79a1ccbb94d0ef61ad392d764a600fd5a8 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 24 Apr 2018 20:27:06 +0200 Subject: Remove build support for HP-UX Note: 3rd party lib support (NSS, etc.) has not been touched. --- xpcom/reflect/xptcall/md/unix/Makefile.in | 11 ----------- xpcom/reflect/xptcall/md/unix/moz.build | 17 ----------------- xpcom/reflect/xptcall/status.html | 15 --------------- 3 files changed, 43 deletions(-) (limited to 'xpcom') diff --git a/xpcom/reflect/xptcall/md/unix/Makefile.in b/xpcom/reflect/xptcall/md/unix/Makefile.in index e4cdc389b..716d79623 100644 --- a/xpcom/reflect/xptcall/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/md/unix/Makefile.in @@ -6,17 +6,6 @@ ###################################################################### # HPPA ###################################################################### -# -# HP-UX/PA32 -# -# for gas and gcc, check comment in xptcinvoke_asm_pa32.s -ifeq ($(OS_ARCH),HP-UX) -ifneq ($(CC),gcc) -# #18875 Building the CPP's (CXX) optimized causes a crash -CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) -endif -endif - # # Linux/HPPA/gcc # diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build index 1d182bbd6..148d3bf35 100644 --- a/xpcom/reflect/xptcall/md/unix/moz.build +++ b/xpcom/reflect/xptcall/md/unix/moz.build @@ -108,23 +108,6 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['OS_ARCH'] in ('Bitrig', 'OpenBSD'): 'xptcstubs_arm_openbsd.cpp', ] -if CONFIG['OS_ARCH'] == 'HP-UX': - if CONFIG['CC'] != 'gcc': - if CONFIG['OS_TEST'] == 'ia64': - SOURCES += [ - 'xptcinvoke_asm_ipf32.s', - 'xptcinvoke_ipf32.cpp', - 'xptcstubs_asm_ipf32.s', - 'xptcstubs_ipf32.cpp', - ] - else: - SOURCES += [ - 'xptcinvoke_asm_pa32.s', - 'xptcinvoke_pa32.cpp', - 'xptcstubs_asm_pa32.s', - 'xptcstubs_pa32.cpp' - ] - if CONFIG['OS_ARCH'] == 'Linux': if CONFIG['OS_TEST'] in ('hppa', 'hppa2.0', 'hppa1.1'): if CONFIG['GNU_CXX']: diff --git a/xpcom/reflect/xptcall/status.html b/xpcom/reflect/xptcall/status.html index 65de20596..7f8e54a0c 100644 --- a/xpcom/reflect/xptcall/status.html +++ b/xpcom/reflect/xptcall/status.html @@ -253,21 +253,6 @@ The word I hear is that this is working and done - -Done -HP-UX - -Contributed code! -Thomas Wang <wang@cup.hp.com>
-Contributed code! -Mike Gleeson <mgleeson1@netscape.com> - -I hear that this code is checked in and working. Though, there is some -doubt - see bug -#17997 - - - Done AIX PPC -- cgit v1.2.3