Changeset 136086 in webkit

Timestamp:

Nov 28, 2012, 7:16:11 PM (14 years ago)

Author:

msaboff@apple.com

Message:

Change Bytecompiler s_dumpsGeneratedCode to an Options value
​https://bugs.webkit.org/show_bug.cgi?id=103588

Reviewed by Filip Pizlo.

Moved the control of dumping bytecodes to Options::dumpGeneratedBytecodes.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::CodeBlock):

• bytecompiler/BytecodeGenerator.cpp:
• bytecompiler/BytecodeGenerator.h:
• jsc.cpp:

(runWithScripts):

• runtime/Options.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (2 diffs)
• bytecompiler/BytecodeGenerator.h (modified) (1 diff)
• jsc.cpp (modified) (1 diff)
• runtime/Options.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-11-28  Michael Saboff  <msaboff@apple.com>
+
+        Change Bytecompiler s_dumpsGeneratedCode to an Options value
+        https://bugs.webkit.org/show_bug.cgi?id=103588
+
+        Reviewed by Filip Pizlo.
+
+        Moved the control of dumping bytecodes to Options::dumpGeneratedBytecodes.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::CodeBlock):
+        * bytecompiler/BytecodeGenerator.cpp:
+        * bytecompiler/BytecodeGenerator.h:
+        * jsc.cpp:
+        (runWithScripts):
+        * runtime/Options.h:
+
 2012-11-28  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1892 +1892 @@
     m_instructions = WTF::RefCountedArray<Instruction>(instructions);
 
-    if (BytecodeGenerator::dumpsGeneratedCode())
+    if (Options::dumpGeneratedBytecodes())
         dump();
     m_globalData->finishedCompiling(this);

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -39 +39 @@
 #include "JSNameScope.h"
 #include "LowLevelInterpreter.h"
+#include "Options.h"
 #include "StrongInlines.h"
 #include <wtf/text/WTFString.h>
@@ -146 +147 @@
 }
 #endif
-
-static bool s_dumpsGeneratedCode = false;
-
-void BytecodeGenerator::setDumpsGeneratedCode(bool dumpsGeneratedCode)
-{
-    s_dumpsGeneratedCode = dumpsGeneratedCode;
-}
-
-bool BytecodeGenerator::dumpsGeneratedCode()
-{
-    return s_dumpsGeneratedCode;
-}
 
 ParserError BytecodeGenerator::generate()

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -210 +210 @@
         typedef DeclarationStacks::FunctionStack FunctionStack;
 
-        JS_EXPORT_PRIVATE static void setDumpsGeneratedCode(bool dumpsGeneratedCode);
-        static bool dumpsGeneratedCode();
-
         BytecodeGenerator(JSGlobalData&, ProgramNode*, UnlinkedProgramCodeBlock*, DebuggerMode, ProfilerMode);
         BytecodeGenerator(JSGlobalData&, FunctionBodyNode*, UnlinkedFunctionCodeBlock*, DebuggerMode, ProfilerMode);

trunk/Source/JavaScriptCore/jsc.cpp

@@ -541 +541 @@
 
     if (dump)
-        BytecodeGenerator::setDumpsGeneratedCode(true);
+        JSC::Options::dumpGeneratedBytecodes() = true;
 
     JSGlobalData& globalData = globalObject->globalData();

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -69 +69 @@
     v(bool, forceDFGCodeBlockLiveness, false) \
     \
+    v(bool, dumpGeneratedBytecodes, false) \
+    \
     /* showDisassembly implies showDFGDisassembly. */ \
     v(bool, showDisassembly, false) \