Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset f6de6926530e (bug 1409441)

Browse Source
This commit is contained in:
Sebastian Hengst 2017-10-19 00:11:27 +02:00
parent 5c8bf0e59b
commit a64536590a
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/vm/Stack-inl.h
View File

@ -946,21 +946,6 @@ Activation::isProfiling() const
return asJit()->isProfiling();
}
void
Activation::registerProfiling()
{
MOZ_ASSERT(isProfiling());
cx_->profilingActivation_ = this;
}
void
Activation::unregisterProfiling()
{
MOZ_ASSERT(isProfiling());
MOZ_ASSERT(cx_->profilingActivation_ == this);
cx_->profilingActivation_ = prevProfiling_;
}
Activation*
Activation::mostRecentProfiling()
{

18
js/src/vm/Stack.cpp
View File

@ -1513,7 +1513,8 @@ jit::JitActivation::JitActivation(JSContext* cx)
jit::JitActivation::~JitActivation()
{
unregisterProfiling();
if (isProfiling())
unregisterProfiling();
cx_->jitActivation = prevJitActivation_;
// All reocvered value are taken from activation during the bailout.
@ -1777,6 +1778,21 @@ InterpreterFrameIterator::operator++()
return *this;
}
void
Activation::registerProfiling()
{
MOZ_ASSERT(isProfiling());
cx_->profilingActivation_ = this;
}
void
Activation::unregisterProfiling()
{
MOZ_ASSERT(isProfiling());
MOZ_ASSERT(cx_->profilingActivation_ == this);
cx_->profilingActivation_ = prevProfiling_;
}
ActivationIterator::ActivationIterator(JSContext* cx)
: activation_(cx->activation_)
{

4
js/src/vm/Stack.h
View File

@ -1322,8 +1322,8 @@ class Activation
inline bool hasWasmExitFP() const;
inline bool isProfiling() const;
inline void registerProfiling();
inline void unregisterProfiling();
void registerProfiling();
void unregisterProfiling();
InterpreterActivation* asInterpreter() const {
MOZ_ASSERT(isInterpreter());