author | Andrew McCreight <continuation@gmail.com> |
Wed, 07 Mar 2018 13:22:05 -0800 | |
changeset 462086 | 9322f0ce835f554a0108f59dba244f32ebd8d492 |
parent 462085 | 1231cfa429da4047ce895adea82e93e3dee81d05 |
child 462087 | 90ad57245468c398be0be3fcdb2cdec1b9333232 |
push id | 1683 |
push user | sfraser@mozilla.com |
push date | Thu, 26 Apr 2018 16:43:40 +0000 |
treeherder | mozilla-release@5af6cb21869d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | njn |
bugs | 1443951 |
milestone | 60.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp +++ b/xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp @@ -99,17 +99,16 @@ xptiInterfaceEntry::ResolveLocked() parent->mMethodBaseIndex + parent->mDescriptor->num_methods; mConstantBaseIndex = parent->mConstantBaseIndex + parent->mDescriptor->num_constants; } - LOG_RESOLVE(("+ complete resolve of %s\n", mName)); SetResolvedState(FULLY_RESOLVED); return true; } /**************************************************/ // These non-virtual methods handle the delegated nsIInterfaceInfo methods.
--- a/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp +++ b/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp @@ -115,17 +115,16 @@ XPTInterfaceInfoManager::RegisterBuffer( } } void XPTInterfaceInfoManager::RegisterXPTHeader(const XPTHeader* aHeader) { if (aHeader->major_version >= XPT_MAJOR_INCOMPATIBLE_VERSION) { NS_ASSERTION(!aHeader->num_interfaces,"bad libxpt"); - LOG_AUTOREG((" file is version %d.%d Type file of version %d.0 or higher can not be read.\n", (int)header->major_version, (int)header->minor_version, (int)XPT_MAJOR_INCOMPATIBLE_VERSION)); } xptiTypelibGuts* typelib = xptiTypelibGuts::Create(aHeader); ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor); for(uint16_t k = 0; k < aHeader->num_interfaces; k++) VerifyAndAddEntryIfNew(aHeader->interface_directory + k, k, typelib); } @@ -147,17 +146,16 @@ XPTInterfaceInfoManager::VerifyAndAddEnt fprintf(stderr, "ignoring too large interface: %s\n", iface->name); return; } mWorkingSet.mTableReentrantMonitor.AssertCurrentThreadIn(); xptiInterfaceEntry* entry = mWorkingSet.mIIDTable.Get(iface->iid); if (entry) { // XXX validate this info to find possible inconsistencies - LOG_AUTOREG((" ignoring repeated interface: %s\n", iface->name)); return; } // Build a new xptiInterfaceEntry object and hook it up. entry = xptiInterfaceEntry::Create(iface->name, iface->iid, iface->interface_descriptor, @@ -170,18 +168,16 @@ XPTInterfaceInfoManager::VerifyAndAddEnt entry->SetBuiltinClassFlag(iface->interface_descriptor->IsBuiltinClass()); entry->SetMainProcessScriptableOnlyFlag( iface->interface_descriptor->IsMainProcessScriptableOnly()); mWorkingSet.mIIDTable.Put(entry->IID(), entry); mWorkingSet.mNameTable.Put(entry->GetTheName(), entry); typelib->SetEntryAt(idx, entry); - - LOG_AUTOREG((" added interface: %s\n", iface->name)); } // this is a private helper static nsresult EntryToInfo(xptiInterfaceEntry* entry, nsIInterfaceInfo **_retval) { if (!entry) { *_retval = nullptr;
--- a/xpcom/reflect/xptinfo/xptiprivate.h +++ b/xpcom/reflect/xptinfo/xptiprivate.h @@ -53,32 +53,16 @@ #include "prtime.h" #include "prenv.h" #include <stdio.h> #include <stdarg.h> /***************************************************************************/ -#if 0 && defined(DEBUG_jband) -#define LOG_RESOLVE(x) printf x -#define LOG_LOAD(x) printf x -#define LOG_AUTOREG(x) do{printf x; xptiInterfaceInfoManager::WriteToLog x;}while(0) -#else -#define LOG_RESOLVE(x) ((void)0) -#define LOG_LOAD(x) ((void)0) -#define LOG_AUTOREG(x) ((void)0) -#endif - -#if 1 && defined(DEBUG_jband) -#define SHOW_INFO_COUNT_STATS -#endif - -/***************************************************************************/ - class xptiInterfaceInfo; class xptiInterfaceEntry; class xptiTypelibGuts; extern XPTArena* gXPTIStructArena; /***************************************************************************/