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

Bug 1464134 part 6 - Replace AbstractFramePtr::compartment with AbstractFramePtr::realm. r=anba

Browse Source
This commit is contained in:
Jan de Mooij 2018-05-30 20:14:18 +02:00
parent 2eebe87aa6
commit 7ff3b9af6c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/builtin/Eval.cpp
View File

@ -421,7 +421,7 @@ js::DirectEval(JSContext* cx, HandleValue v, MutableHandleValue vp)
JSOp(*iter.pc()) == JSOP_STRICTEVAL || JSOp(*iter.pc()) == JSOP_STRICTEVAL ||
JSOp(*iter.pc()) == JSOP_SPREADEVAL || JSOp(*iter.pc()) == JSOP_SPREADEVAL ||
JSOp(*iter.pc()) == JSOP_STRICTSPREADEVAL); JSOp(*iter.pc()) == JSOP_STRICTSPREADEVAL);
MOZ_ASSERT(caller.compartment() == caller.script()->compartment()); MOZ_ASSERT(caller.realm() == caller.script()->realm());
RootedObject envChain(cx, caller.environmentChain()); RootedObject envChain(cx, caller.environmentChain());
return EvalKernel(cx, v, DIRECT_EVAL, caller, envChain, iter.pc(), vp); return EvalKernel(cx, v, DIRECT_EVAL, caller, envChain, iter.pc(), vp);

2
js/src/vm/EnvironmentObject.cpp
View File

@ -2829,7 +2829,7 @@ DebugEnvironments::onPopVar(JSContext* cx, const EnvironmentIter& ei)
void void
DebugEnvironments::onPopWith(AbstractFramePtr frame) DebugEnvironments::onPopWith(AbstractFramePtr frame)
{ {
Realm* realm = JS::GetRealmForCompartment(frame.compartment()); Realm* realm = frame.realm();
if (DebugEnvironments* envs = realm->debugEnvs()) if (DebugEnvironments* envs = realm->debugEnvs())
envs->liveEnvs.remove(&frame.environmentChain()->as<WithEnvironmentObject>()); envs->liveEnvs.remove(&frame.environmentChain()->as<WithEnvironmentObject>());
} }

2
js/src/vm/SavedStacks.cpp
View File

@ -1481,7 +1481,7 @@ SavedStacks::insertFrames(JSContext* cx, MutableHandleSavedFrame frame,
RootedAtom displayAtom(cx, iter.maybeFunctionDisplayAtom()); RootedAtom displayAtom(cx, iter.maybeFunctionDisplayAtom());
auto principals = JS::GetRealmForCompartment(iter.compartment())->principals(); auto principals = iter.realm()->principals();
MOZ_ASSERT_IF(framePtr && !iter.isWasm(), iter.pc()); MOZ_ASSERT_IF(framePtr && !iter.isWasm(), iter.pc());
if (!stackChain->emplaceBack(location.source(), if (!stackChain->emplaceBack(location.source(),

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

@ -493,10 +493,10 @@ AbstractFramePtr::pushVarEnvironment(JSContext* cx, HandleScope scope)
return js::PushVarEnvironmentObject(cx, scope, *this); return js::PushVarEnvironmentObject(cx, scope, *this);
} }
inline JSCompartment* inline JS::Realm*
AbstractFramePtr::compartment() const AbstractFramePtr::realm() const
{ {
return environmentChain()->compartment(); return environmentChain()->realm();
} }
inline unsigned inline unsigned

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

@ -215,7 +215,7 @@ class AbstractFramePtr
template <typename SpecificEnvironment> template <typename SpecificEnvironment>
inline void popOffEnvironmentChain(); inline void popOffEnvironmentChain();
inline JSCompartment* compartment() const; inline JS::Realm* realm() const;
inline bool hasInitialEnvironment() const; inline bool hasInitialEnvironment() const;
inline bool isGlobalFrame() const; inline bool isGlobalFrame() const;