Bug 1478509 - Restore ordering for EnterScript and CheckGlobalDeclarationConflicts calls, r=jandem.

--HG--
extra : rebase_source : 861e3be00aa28faac8b3fcac49dd170c3406fe4c

js/src/jit-test/tests/profiler/bug1478509.js

@@ -0,0 +1,5 @@
+// |jit-test| error: SyntaxError
+enableGeckoProfiling();
+s = newGlobal();
+evalcx("let x;", s);
+evalcx("let x;", s);

js/src/vm/Stack.cpp

@@ -228,9 +228,13 @@ InterpreterFrame::prologue(JSContext* cx)
             lexicalEnv = &cx->global()->lexicalEnvironment();
             varObjRoot = cx->global();
         }
-        if (!probes::EnterScript(cx, script, nullptr, this))
+        if (!CheckGlobalDeclarationConflicts(cx, script, lexicalEnv, varObjRoot)) {
+            // Treat this as a script entry, for consistency with Ion.
+            if (script->trackRecordReplayProgress())
+                mozilla::recordreplay::AdvanceExecutionProgressCounter();
             return false;
-        return CheckGlobalDeclarationConflicts(cx, script, lexicalEnv, varObjRoot);
+        }
+        return probes::EnterScript(cx, script, nullptr, this);
     }
 
     if (isModuleFrame())