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

Bug 1022891 - Part 2: Teach IonBailoutIterator about PJS scripts. (r=nbp)

Browse Source
This commit is contained in:
Shu-yu Guo 2014-06-12 12:46:17 -07:00
parent 496e463f68
commit a09ed4d7c2
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jit/IonFrames.cpp
View File

@ -1698,7 +1698,14 @@ JitFrameIterator::ionScriptFromCalleeToken() const
switch (GetCalleeTokenTag(calleeToken())) {
case CalleeToken_Function:
case CalleeToken_Script:
return mode_ == ParallelExecution ? script()->parallelIonScript() : script()->ionScript();
switch (mode_) {
case SequentialExecution:
return script()->ionScript();
case ParallelExecution:
return script()->parallelIonScript();
default:
MOZ_ASSUME_UNREACHABLE("No such execution mode");
}
default:
MOZ_ASSUME_UNREACHABLE("unknown callee token type");
}

6
js/src/jit/arm/Bailouts-arm.cpp
View File

@ -79,7 +79,11 @@ IonBailoutIterator::IonBailoutIterator(const JitActivationIterator &activations,
current_ = fp;
type_ = JitFrame_IonJS;
topFrameSize_ = current_ - sp;
topIonScript_ = script()->ionScript();
switch (mode_) {
case SequentialExecution: topIonScript_ = script()->ionScript(); break;
case ParallelExecution: topIonScript_ = script()->parallelIonScript(); break;
default: MOZ_ASSUME_UNREACHABLE("No such execution mode");
}
if (bailout->frameClass() == FrameSizeClass::None()) {
snapshotOffset_ = bailout->snapshotOffset();

6
js/src/jit/mips/Bailouts-mips.cpp
View File

@ -23,7 +23,11 @@ IonBailoutIterator::IonBailoutIterator(const JitActivationIterator &activations,
current_ = fp;
type_ = JitFrame_IonJS;
topFrameSize_ = current_ - sp;
topIonScript_ = script()->ionScript();
switch (mode_) {
case SequentialExecution: topIonScript_ = script()->ionScript(); break;
case ParallelExecution: topIonScript_ = script()->parallelIonScript(); break;
default: MOZ_ASSUME_UNREACHABLE("No such execution mode");
}
if (bailout->frameClass() == FrameSizeClass::None()) {
snapshotOffset_ = bailout->snapshotOffset();

6
js/src/jit/x64/Bailouts-x64.cpp
View File

@ -56,7 +56,11 @@ IonBailoutIterator::IonBailoutIterator(const JitActivationIterator &activations,
current_ = fp;
type_ = JitFrame_IonJS;
topFrameSize_ = current_ - sp;
topIonScript_ = script()->ionScript();
switch (mode_) {
case SequentialExecution: topIonScript_ = script()->ionScript(); break;
case ParallelExecution: topIonScript_ = script()->parallelIonScript(); break;
default: MOZ_ASSUME_UNREACHABLE("No such execution mode");
}
snapshotOffset_ = bailout->snapshotOffset();
}

6
js/src/jit/x86/Bailouts-x86.cpp
View File

@ -76,7 +76,11 @@ IonBailoutIterator::IonBailoutIterator(const JitActivationIterator &activations,
current_ = fp;
type_ = JitFrame_IonJS;
topFrameSize_ = current_ - sp;
topIonScript_ = script()->ionScript();
switch (mode_) {
case SequentialExecution: topIonScript_ = script()->ionScript(); break;
case ParallelExecution: topIonScript_ = script()->parallelIonScript(); break;
default: MOZ_ASSUME_UNREACHABLE("No such execution mode");
}
if (bailout->frameClass() == FrameSizeClass::None()) {
snapshotOffset_ = bailout->snapshotOffset();