Backed out changeset fe63bf2c6a3a (bug 935228) as result of the discussion of Bug 937997 Comment 48 Trees Closed due to OOM on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 14 Nov 2013 10:01:39 +0100
changeset 169397 4e3a84277bd2d1295715e340c0aaf178e90419e8
parent 169396 0bfc071cd47c81a57be4d54acdd4de03b258bfc0
child 169398 01b9888de10c11a89191c7bdc3bf7f0df81edb7b
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs935228, 937997
milestone28.0a1
backs outfe63bf2c6a3ae7505ff65eb8e945f5f15f3080e4
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset fe63bf2c6a3a (bug 935228) as result of the discussion of Bug 937997 Comment 48 Trees Closed due to OOM on a CLOSED TREE
js/src/jit/BaselineCompiler.cpp
js/src/jit/BaselineJIT.cpp
js/src/jit/BaselineJIT.h
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -246,19 +246,16 @@ BaselineCompiler::compile()
 
         JS_ASSERT(added == script->nTypeSets);
 
         // The last entry in the last index found, and is used to avoid binary
         // searches for the sought entry when queries are in linear order.
         bytecodeMap[script->nTypeSets] = 0;
     }
 
-    if (script->compartment()->debugMode())
-        baselineScript->setDebugMode();
-
     return Method_Compiled;
 }
 
 bool
 BaselineCompiler::emitPrologue()
 {
     masm.push(BaselineFrameReg);
     masm.mov(BaselineStackReg, BaselineFrameReg);
--- a/js/src/jit/BaselineJIT.cpp
+++ b/js/src/jit/BaselineJIT.cpp
@@ -741,20 +741,16 @@ BaselineScript::pcForReturnAddress(JSScr
     return pcForReturnOffset(script, uint32_t(nativeAddress - method_->raw()));
 }
 
 void
 BaselineScript::toggleDebugTraps(JSScript *script, jsbytecode *pc)
 {
     JS_ASSERT(script->baselineScript() == this);
 
-    // Only scripts compiled for debug mode have toggled calls.
-    if (!debugMode())
-        return;
-
     SrcNoteLineScanner scanner(script->notes(), script->lineno);
 
     JSRuntime *rt = script->runtimeFromMainThread();
     IonContext ictx(rt, script->compartment(), nullptr);
     AutoFlushCache afc("DebugTraps", rt->jitRuntime());
 
     for (uint32_t i = 0; i < numPCMappingIndexEntries(); i++) {
         PCMappingIndexEntry &entry = pcMappingIndexEntry(i);
--- a/js/src/jit/BaselineJIT.h
+++ b/js/src/jit/BaselineJIT.h
@@ -127,21 +127,17 @@ struct BaselineScript
         NEEDS_ARGS_OBJ = 1 << 0,
 
         // Flag set when discarding JIT code, to indicate this script is
         // on the stack and should not be discarded.
         ACTIVE = 1 << 1,
 
         // Flag set when the script contains any writes to its on-stack
         // (rather than call object stored) arguments.
-        MODIFIES_ARGUMENTS = 1 << 2,
-
-        // Flag set when compiled for use for debug mode. Handles various
-        // Debugger hooks and compiles toggled calls for traps.
-        DEBUG_MODE = 1 << 3
+        MODIFIES_ARGUMENTS = 1 << 2
     };
 
   private:
     uint32_t flags_;
 
   private:
     void trace(JSTracer *trc);
 
@@ -200,23 +196,16 @@ struct BaselineScript
 
     void setModifiesArguments() {
         flags_ |= MODIFIES_ARGUMENTS;
     }
     bool modifiesArguments() {
         return flags_ & MODIFIES_ARGUMENTS;
     }
 
-    void setDebugMode() {
-        flags_ |= DEBUG_MODE;
-    }
-    bool debugMode() const {
-        return flags_ & DEBUG_MODE;
-    }
-
     uint32_t prologueOffset() const {
         return prologueOffset_;
     }
     uint8_t *prologueEntryAddr() const {
         return method_->raw() + prologueOffset_;
     }
 
     ICEntry *icEntryList() {