From 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Thu, 9 Feb 2012 14:16:12 +0100
Subject: Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525
 (http://svn.webkit.org/repository/webkit/trunk@107223)

---
 Source/JavaScriptCore/bytecode/CodeBlock.h | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'Source/JavaScriptCore/bytecode/CodeBlock.h')

diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.h b/Source/JavaScriptCore/bytecode/CodeBlock.h
index 23d6a6b6d..bc2feeb2a 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.h
@@ -134,11 +134,9 @@ namespace JSC {
 
         static void dumpStatistics();
 
-#if !defined(NDEBUG) || ENABLE_OPCODE_SAMPLING
         void dump(ExecState*) const;
         void printStructures(const Instruction*) const;
         void printStructure(const char* name, const Instruction*, int operand) const;
-#endif
 
         bool isStrictMode() const { return m_isStrictMode; }
 
@@ -354,17 +352,8 @@ namespace JSC {
         {
             m_shouldDiscardBytecode = true;
         }
-        void handleBytecodeDiscardingOpportunity()
-        {
-            if (!!alternative())
-                discardBytecode();
-            else
-                discardBytecodeLater();
-        }
         
-#ifndef NDEBUG
         bool usesOpcode(OpcodeID);
-#endif
 
         unsigned instructionCount() { return m_instructionCount; }
         void setInstructionCount(unsigned instructionCount) { m_instructionCount = instructionCount; }
@@ -522,6 +511,7 @@ namespace JSC {
         ValueProfile* addValueProfile(int bytecodeOffset)
         {
             ASSERT(bytecodeOffset != -1);
+            ASSERT(m_valueProfiles.isEmpty() || m_valueProfiles.last().m_bytecodeOffset < bytecodeOffset);
             m_valueProfiles.append(ValueProfile(bytecodeOffset));
             return &m_valueProfiles.last();
         }
@@ -1016,7 +1006,6 @@ namespace JSC {
         void tallyFrequentExitSites() { }
 #endif
         
-#if !defined(NDEBUG) || ENABLE(OPCODE_SAMPLING)
         void dump(ExecState*, const Vector<Instruction>::const_iterator& begin, Vector<Instruction>::const_iterator&) const;
 
         CString registerName(ExecState*, int r) const;
@@ -1026,7 +1015,6 @@ namespace JSC {
         void printGetByIdOp(ExecState*, int location, Vector<Instruction>::const_iterator&, const char* op) const;
         void printCallOp(ExecState*, int location, Vector<Instruction>::const_iterator&, const char* op) const;
         void printPutByIdOp(ExecState*, int location, Vector<Instruction>::const_iterator&, const char* op) const;
-#endif
         void visitStructures(SlotVisitor&, Instruction* vPC) const;
         
 #if ENABLE(DFG_JIT)
-- 
cgit v1.2.3