Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 18:32:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset b3a8ba0c340f (bug 1094150) for cpp and other failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-10-30 13:40:08 +01:00
parent 07d26fbeb6
commit 01c1b52ccb
16 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/configure.in
View File

@ -3195,19 +3195,6 @@ MOZ_ARG_ENABLE_BOOL(vtune,
MOZ_VTUNE=1,
MOZ_VTUNE= )
dnl ========================================================
dnl JitSpew. Enabled by default in debug builds.
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(jitspew,
[ --enable-jitspew Enable the Jit spew and IONFLAGS.],
JS_JITSPEW=1,
JS_JITSPEW= )
if test -n "$MOZ_DEBUG"; then
JS_JITSPEW=1
fi
AC_SUBST(JS_JITSPEW)
dnl ========================================================
dnl Debug (see Bug 939505)
dnl ========================================================

7
js/src/jit/BacktrackingAllocator.cpp
View File

@ -1408,23 +1408,20 @@ BacktrackingAllocator::tryAllocateRegister(PhysicalRegister& r, LiveBundle* bund
// case of multiple conflicting sets keep track of the set with the
// lowest maximum spill weight.
// The #ifdef guards against "unused variable 'existing'" bustage.
#ifdef JS_JITSPEW
if (JitSpewEnabled(JitSpew_RegAlloc)) {
if (aliasedConflicting.length() == 1) {
LiveBundle* existing = aliasedConflicting[0];
mozilla::DebugOnly<LiveBundle*> existing = aliasedConflicting[0];
JitSpew(JitSpew_RegAlloc, " %s collides with %s [weight %lu]",
r.reg.name(), existing->toString(), computeSpillWeight(existing));
} else {
JitSpew(JitSpew_RegAlloc, " %s collides with the following", r.reg.name());
for (size_t i = 0; i < aliasedConflicting.length(); i++) {
LiveBundle* existing = aliasedConflicting[i];
mozilla::DebugOnly<LiveBundle*> existing = aliasedConflicting[i];
JitSpew(JitSpew_RegAlloc, " %s [weight %lu]",
existing->toString(), computeSpillWeight(existing));
}
}
}
#endif
if (conflicting.empty()) {
if (!conflicting.appendAll(aliasedConflicting))

4
js/src/jit/BaselineBailouts.cpp
View File

@ -1420,14 +1420,12 @@ jit::BailoutIonToBaseline(JSContext* cx, JitActivation* activation, JitFrameIter
// Entry - Interpreter or other calling into Ion.
// Rectifier - Arguments rectifier calling into Ion.
MOZ_ASSERT(iter.isBailoutJS());
#if defined(DEBUG) || defined(JS_JITSPEW)
FrameType prevFrameType = iter.prevType();
mozilla::DebugOnly<FrameType> prevFrameType = iter.prevType();
MOZ_ASSERT(prevFrameType == JitFrame_IonJS ||
prevFrameType == JitFrame_BaselineStub ||
prevFrameType == JitFrame_Entry ||
prevFrameType == JitFrame_Rectifier ||
prevFrameType == JitFrame_IonAccessorIC);
#endif
// All incoming frames are going to look like this:
//

4
js/src/jit/BaselineDebugModeOSR.cpp
View File

@ -287,7 +287,7 @@ CollectInterpreterStackScripts(JSContext* cx, const Debugger::ExecutionObservabl
return true;
}
#ifdef JS_JITSPEW
#ifdef DEBUG
static const char*
ICEntryKindToString(ICEntry::Kind kind)
{
@ -312,7 +312,7 @@ ICEntryKindToString(ICEntry::Kind kind)
MOZ_CRASH("bad ICEntry kind");
}
}
#endif // JS_JITSPEW
#endif // DEBUG
static void
SpewPatchBaselineFrame(uint8_t* oldReturnAddress, uint8_t* newReturnAddress,

4
js/src/jit/C1Spewer.cpp
View File

@ -4,7 +4,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifdef JS_JITSPEW
#ifdef DEBUG
#include "jit/C1Spewer.h"
@ -190,5 +190,5 @@ C1Spewer::spewPass(GenericPrinter& out, MBasicBlock* block)
out.printf(" end_block\n");
}
#endif /* JS_JITSPEW */
#endif /* DEBUG */

4
js/src/jit/C1Spewer.h
View File

@ -7,7 +7,7 @@
#ifndef jit_C1Spewer_h
#define jit_C1Spewer_h
#ifdef JS_JITSPEW
#ifdef DEBUG
#include "NamespaceImports.h"
@ -46,6 +46,6 @@ class C1Spewer
} // namespace jit
} // namespace js
#endif /* JS_JITSPEW */
#endif /* DEBUG */
#endif /* jit_C1Spewer_h */

6
js/src/jit/CodeGenerator.cpp
View File

@ -4099,7 +4099,7 @@ CodeGenerator::generateBody()
if (current->isTrivial())
continue;
#ifdef JS_JITSPEW
#ifdef DEBUG
const char* filename = nullptr;
size_t lineNumber = 0;
unsigned columnNumber = 0;
@ -4109,10 +4109,8 @@ CodeGenerator::generateBody()
lineNumber = PCToLineNumber(current->mir()->info().script(), current->mir()->pc(),
&columnNumber);
} else {
#ifdef DEBUG
lineNumber = current->mir()->lineno();
columnNumber = current->mir()->columnIndex();
#endif
}
JitSpew(JitSpew_Codegen, "# block%" PRIuSIZE " %s:%" PRIuSIZE ":%u%s:",
i, filename ? filename : "?", lineNumber, columnNumber,
@ -4133,7 +4131,7 @@ CodeGenerator::generateBody()
#endif
for (LInstructionIterator iter = current->begin(); iter != current->end(); iter++) {
#ifdef JS_JITSPEW
#ifdef DEBUG
JitSpewStart(JitSpew_Codegen, "instruction %s", iter->opName());
if (const char* extra = iter->extraName())
JitSpewCont(JitSpew_Codegen, ":%s", extra);

2
js/src/jit/IonBuilder.cpp
View File

@ -803,7 +803,7 @@ IonBuilder::build()
if (!current)
return false;
#ifdef JS_JITSPEW
#ifdef DEBUG
if (info().isAnalysis()) {
JitSpew(JitSpew_IonScripts, "Analyzing script %s:%" PRIuSIZE " (%p) %s",
script()->filename(), script()->lineno(), (void*)script(),

2
js/src/jit/IonOptimizationLevels.h
View File

@ -24,7 +24,7 @@ enum OptimizationLevel
Optimization_Count
};
#ifdef JS_JITSPEW
#ifdef DEBUG
inline const char*
OptimizationLevelString(OptimizationLevel level)
{

4
js/src/jit/JitSpewer.cpp
View File

@ -4,7 +4,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifdef JS_JITSPEW
#ifdef DEBUG
#include "jit/JitSpewer.h"
@ -642,5 +642,5 @@ jit::DisableChannel(JitSpewChannel channel)
LoggingBits &= ~(1 << uint32_t(channel));
}
#endif /* JS_JITSPEW */
#endif /* DEBUG */

6
js/src/jit/JitSpewer.h
View File

@ -105,7 +105,7 @@ class TempAllocator;
// None of the global functions have effect on non-debug builds.
static const int NULL_ID = -1;
#ifdef JS_JITSPEW
#ifdef DEBUG
// Class made to hold the MIR and LIR graphs of an AsmJS / Ion compilation.
class GraphSpewer
@ -247,7 +247,7 @@ static inline void EnableIonDebugSyncLogging()
static inline void EnableIonDebugAsyncLogging()
{ }
#endif /* JS_JITSPEW */
#endif /* DEBUG */
template <JitSpewChannel Channel>
class AutoDisableSpew
@ -263,7 +263,7 @@ class AutoDisableSpew
~AutoDisableSpew()
{
#ifdef JS_JITSPEW
#ifdef DEBUG
if (enabled_)
EnableChannel(Channel);
#endif

4
js/src/jit/JitcodeMap.cpp
View File

@ -1390,10 +1390,8 @@ JitcodeRegionEntry::WriteRun(CompactBufferWriter& writer,
uint32_t curBc = curBytecodeOffset;
while (curBc < nextBytecodeOffset) {
jsbytecode* pc = entry[i].tree->script()->offsetToPC(curBc);
#ifdef JS_JITSPEW
JSOp op = JSOp(*pc);
mozilla::DebugOnly<JSOp> op = JSOp(*pc);
JitSpewCont(JitSpew_Profiling, "%s ", js_CodeName[op]);
#endif
curBc += GetBytecodeLength(pc);
}
JitSpewFin(JitSpew_Profiling);

2
js/src/jit/MIR.cpp
View File

@ -508,7 +508,7 @@ MDefinition::dumpLocation() const
out.finish();
}
#if defined(DEBUG) || defined(JS_JITSPEW)
#ifdef DEBUG
size_t
MDefinition::useCount() const
{

2
js/src/jit/MIR.h
View File

@ -688,7 +688,7 @@ class MDefinition : public MNode
uses_.remove(use);
}
#if defined(DEBUG) || defined(JS_JITSPEW)
#ifdef DEBUG
// Number of uses of this instruction. This function is only available
// in DEBUG mode since it requires traversing the list. Most users should
// use hasUses() or hasOneUse() instead.

2
js/src/jit/Recover.cpp
View File

@ -117,7 +117,7 @@ MResumePoint::writeRecoverData(CompactBufferWriter& writer) const
// arguments_object.
MOZ_ASSERT(CountArgSlots(script, fun) < SNAPSHOT_MAX_NARGS + 4);
#ifdef JS_JITSPEW
#ifdef DEBUG
uint32_t implicit = StartArgSlot(script);
#endif
uint32_t formalArgs = CountArgSlots(script, fun);

3
js/src/moz.build
View File

@ -616,9 +616,6 @@ if CONFIG['JS_HAS_CTYPES']:
if CONFIG['MOZ_LINKER']:
DEFINES['MOZ_LINKER'] = True
if CONFIG['JS_JITSPEW']:
DEFINES['JS_JITSPEW'] = True
if CONFIG['_MSC_VER']:
if CONFIG['CPU_ARCH'] == 'x86':
SOURCES['builtin/RegExp.cpp'].no_pgo = True # Bug 772303