Do not count control-flow merges twice in IFEQX, we already do it in IFEQ (fixed by brendan as part of 469625, r=me).
authorAndreas Gal <gal@mozilla.com>
Thu, 29 Jan 2009 23:45:16 -0800
changeset 24495 aca68a29101db3dfe178a1e09abd74b1848d6285
parent 24494 f0e215b8c63048b08521420da3da1c68e0a9ffac
child 24496 271e5fa192fd05894d83e300c6ba45487c8ad2f5
child 24497 88bbe39f479c04bb5a4e0ff07d2e39aafa567896
push id5074
push userrsayre@mozilla.com
push dateSat, 31 Jan 2009 19:45:42 +0000
treeherdermozilla-central@f1cade532f6f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs469625
milestone1.9.2a1pre
Do not count control-flow merges twice in IFEQX, we already do it in IFEQ (fixed by brendan as part of 469625, r=me).
js/src/jstracer.cpp
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -8273,17 +8273,16 @@ JS_REQUIRES_STACK bool
 TraceRecorder::record_JSOP_GOTOX()
 {
     return true;
 }
 
 JS_REQUIRES_STACK bool
 TraceRecorder::record_JSOP_IFEQX()
 {
-    trackCfgMerges(cx->fp->regs->pc);
     return record_JSOP_IFEQ();
 }
 
 JS_REQUIRES_STACK bool
 TraceRecorder::record_JSOP_IFNEX()
 {
     return record_JSOP_IFNE();
 }