Changeset 35652 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 9, 2008, 4:00:38 AM (17 years ago)

Author:

[email protected]

Message:

2008-08-09 Cameron Zwarich <​[email protected]>

Reviewed by Oliver.

Revision 35651, despite being a rather trivial change, introduced a
large regression on the regexp-dna SunSpider test. This regression
stemmed from an increase in the size of CodeBlock::dump(). There is
no reason for this method (and several related methods) to be compiled
in non-debug builds with the sampling tool disabled. This patch
conditionally compiles them, reversing the regression on SunSpider.

• JavaScriptCore.exp:
• VM/CodeBlock.cpp:
• VM/CodeBlock.h:
• VM/Machine.cpp:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• VM/CodeBlock.cpp (modified) (2 diffs)
• VM/CodeBlock.h (modified) (2 diffs)
• VM/Machine.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-08-09  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Oliver.
+
+        Revision 35651, despite being a rather trivial change, introduced a
+        large regression on the regexp-dna SunSpider test. This regression
+        stemmed from an increase in the size of CodeBlock::dump(). There is
+        no reason for this method (and several related methods) to be compiled
+        in non-debug builds with the sampling tool disabled. This patch
+        conditionally compiles them, reversing the regression on SunSpider.
+
+        * JavaScriptCore.exp:
+        * VM/CodeBlock.cpp:
+        * VM/CodeBlock.h:
+        * VM/Machine.cpp:
+
 2008-08-08  Cameron Zwarich  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -182 +182 @@
 __ZN3KJS7CStringaSERKS0_
 __ZN3KJS7JSArray4infoE
-__ZN3KJS7Machine13dumpCallFrameEPKNS_9CodeBlockEPNS_14ScopeChainNodeEPNS_12RegisterFileEPKNS_8RegisterE
 __ZN3KJS7Profile10restoreAllEv
 __ZN3KJS7Profile5focusEPKNS_11ProfileNodeE

trunk/JavaScriptCore/VM/CodeBlock.cpp

@@ -38 +38 @@
 namespace KJS {
 
+#if !defined(NDEBUG) || ENABLE_SAMPLING_TOOL
+
 static UString escapeQuotes(const UString& str)
 {
@@ -703 +705 @@
 }
 
+#endif // !defined(NDEBUG) || ENABLE_SAMPLING_TOOL
+
 void CodeBlock::mark()
 {

trunk/JavaScriptCore/VM/CodeBlock.h

@@ -93 +93 @@
         }
 
+#if !defined(NDEBUG) || ENABLE_SAMPLING_TOOL
         void dump(ExecState*) const;
+#endif
         int expressionRangeForVPC(const Instruction*, int& divot, int& startOffset, int& endOffset);
         int lineNumberForVPC(const Instruction* vPC);
@@ -131 +133 @@
 
     private:
+#if !defined(NDEBUG) || ENABLE_SAMPLING_TOOL
         void dump(ExecState*, const Vector<Instruction>::const_iterator& begin, Vector<Instruction>::const_iterator&) const;
+#endif
     };
 

trunk/JavaScriptCore/VM/Machine.cpp

@@ -550 +550 @@
 }
 
+#ifndef NDEBUG
+
 void Machine::dumpCallFrame(const CodeBlock* codeBlock, ScopeChainNode* scopeChain, RegisterFile* registerFile, const Register* r)
 {
@@ -621 +623 @@
 }
 
+#endif
+
+#if !defined(NDEBUG) || HAVE(SAMPLING_TOOL)
+
 bool Machine::isOpcode(Opcode opcode)
 {
@@ -631 +637 @@
 #endif
 }
+
+#endif
 
 NEVER_INLINE bool Machine::unwindCallFrame(ExecState* exec, JSValue* exceptionValue, const Instruction*& vPC, CodeBlock*& codeBlock, ScopeChainNode*& scopeChain, Register*& r)