Bug 743129 - Clear ionReturnOverride in HandleException. (r=dvander)

This commit is contained in:
Kannan Vijayan 2012-05-08 10:47:31 -04:00
parent 3cfbb5ce82
commit 5c0a6e233b

View File

@ -357,6 +357,13 @@ ion::HandleException(ResumeFromException *rfe)
++iter;
}
// Clear any Ion return override that's been set.
// This may happen if a callVM function causes an invalidation (setting the
// override), and then fails, bypassing the bailout handlers that would
// otherwise clear the return override.
if (cx->runtime->hasIonReturnOverride())
cx->runtime->takeIonReturnOverride();
rfe->stackPointer = iter.fp();
}