From f275c5f626c3b1ac8e5b024914b979555c108258 Mon Sep 17 00:00:00 2001 From: Hannes Verschore Date: Tue, 22 Oct 2013 12:19:03 +0200 Subject: [PATCH] Bug 928889: Baseline: Return the correct *pc when in prologue, r=jandem --- js/src/jit/IonFrames.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/src/jit/IonFrames.cpp b/js/src/jit/IonFrames.cpp index cc20ed209d23..171465e510e4 100644 --- a/js/src/jit/IonFrames.cpp +++ b/js/src/jit/IonFrames.cpp @@ -184,9 +184,10 @@ IonFrameIterator::baselineScriptAndPc(JSScript **scriptRes, jsbytecode **pcRes) *scriptRes = script; uint8_t *retAddr = returnAddressToFp(); if (pcRes) { - // If the return address is into the prologue entry addr, then assume PC 0. + // If the return address is into the prologue entry address, then assume start + // of script. if (retAddr == script->baselineScript()->prologueEntryAddr()) { - *pcRes = 0; + *pcRes = script->code; return; }