diff -r 000000000000 -r 6474c204b198 js/src/vm/Debugger-inl.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/vm/Debugger-inl.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef vm_Debugger_inl_h
+#define vm_Debugger_inl_h
+
+#include "vm/Debugger.h"
+
+#include "vm/Stack-inl.h"
+
+inline bool
+js::Debugger::onLeaveFrame(JSContext *cx, AbstractFramePtr frame, bool ok)
+{
+    /* Traps must be cleared from eval frames, see slowPathOnLeaveFrame. */
+    bool evalTraps = frame.isEvalFrame() &&
+                     frame.script()->hasAnyBreakpointsOrStepMode();
+    if (!cx->compartment()->getDebuggees().empty() || evalTraps)
+        ok = slowPathOnLeaveFrame(cx, frame, ok);
+    return ok;
+}
+
+#endif /* vm_Debugger_inl_h */