Changeset 201896 in webkit

Timestamp:

Jun 9, 2016, 5:42:19 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Make some methods const.
​https://bugs.webkit.org/show_bug.cgi?id=158594

Reviewed by Benjamin Poulain.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::columnNumberForBytecodeOffset):
(JSC::CodeBlock::expressionRangeForBytecodeOffset):

• bytecode/CodeBlock.h:
• bytecode/ExpressionRangeInfo.h:

(JSC::ExpressionRangeInfo::encodeFatColumnMode):
(JSC::ExpressionRangeInfo::decodeFatLineMode):
(JSC::ExpressionRangeInfo::decodeFatColumnMode):

• bytecode/UnlinkedCodeBlock.cpp:

(JSC::UnlinkedCodeBlock::lineNumberForBytecodeOffset):
(JSC::UnlinkedCodeBlock::getLineAndColumn):
(JSC::UnlinkedCodeBlock::expressionRangeForBytecodeOffset):

• bytecode/UnlinkedCodeBlock.h:

(JSC::UnlinkedCodeBlock::createRareDataIfNecessary):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::isOpcode):
(JSC::StackFrame::computeLineAndColumn):
(JSC::StackFrame::toString):

• interpreter/Interpreter.h:

(JSC::StackFrame::isNative):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (1 diff)
• bytecode/CodeBlock.h (modified) (1 diff)
• bytecode/ExpressionRangeInfo.h (modified) (3 diffs)
• bytecode/UnlinkedCodeBlock.cpp (modified) (5 diffs)
• bytecode/UnlinkedCodeBlock.h (modified) (3 diffs)
• interpreter/Interpreter.cpp (modified) (2 diffs)
• interpreter/Interpreter.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-06-09  Mark Lam  <mark.lam@apple.com>
+
+        Make some methods const.
+        https://bugs.webkit.org/show_bug.cgi?id=158594
+
+        Reviewed by Benjamin Poulain.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::columnNumberForBytecodeOffset):
+        (JSC::CodeBlock::expressionRangeForBytecodeOffset):
+        * bytecode/CodeBlock.h:
+        * bytecode/ExpressionRangeInfo.h:
+        (JSC::ExpressionRangeInfo::encodeFatColumnMode):
+        (JSC::ExpressionRangeInfo::decodeFatLineMode):
+        (JSC::ExpressionRangeInfo::decodeFatColumnMode):
+        * bytecode/UnlinkedCodeBlock.cpp:
+        (JSC::UnlinkedCodeBlock::lineNumberForBytecodeOffset):
+        (JSC::UnlinkedCodeBlock::getLineAndColumn):
+        (JSC::UnlinkedCodeBlock::expressionRangeForBytecodeOffset):
+        * bytecode/UnlinkedCodeBlock.h:
+        (JSC::UnlinkedCodeBlock::createRareDataIfNecessary):
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::isOpcode):
+        (JSC::StackFrame::computeLineAndColumn):
+        (JSC::StackFrame::toString):
+        * interpreter/Interpreter.h:
+        (JSC::StackFrame::isNative):
+
 2016-06-09  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -3177 +3177 @@
 }
 
-void CodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column)
+void CodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column) const
 {
     m_unlinkedCode->expressionRangeForBytecodeOffset(bytecodeOffset, divot, startOffset, endOffset, line, column);

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -231 +231 @@
     unsigned columnNumberForBytecodeOffset(unsigned bytecodeOffset);
     void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot,
-                                          int& startOffset, int& endOffset, unsigned& line, unsigned& column);
+        int& startOffset, int& endOffset, unsigned& line, unsigned& column) const;
 
     Optional<unsigned> bytecodeOffsetFromCallSiteIndex(CallSiteIndex);

trunk/Source/JavaScriptCore/bytecode/ExpressionRangeInfo.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2013, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87 +87 @@
     }
 
-    void decodeFatLineMode(unsigned& line, unsigned& column)
+    void decodeFatLineMode(unsigned& line, unsigned& column) const
     {
         line = (position >> FatLineModeLineShift) & FatLineModeLineMask;
@@ -93 +93 @@
     }
 
-    void decodeFatColumnMode(unsigned& line, unsigned& column)
+    void decodeFatColumnMode(unsigned& line, unsigned& column) const
     {
         line = (position >> FatColumnModeLineShift) & FatColumnModeLineMask;

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2012, 2013, 2015 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-2013, 2015-2016 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -129 +129 @@
 }
 
-inline void UnlinkedCodeBlock::getLineAndColumn(ExpressionRangeInfo& info,
-    unsigned& line, unsigned& column)
+inline void UnlinkedCodeBlock::getLineAndColumn(const ExpressionRangeInfo& info,
+    unsigned& line, unsigned& column) const
 {
     switch (info.mode) {
@@ -186 +186 @@
 
 void UnlinkedCodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset,
-    int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column)
+    int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column) const
 {
     ASSERT(bytecodeOffset < instructions().count());
@@ -199 +199 @@
     }
 
-    Vector<ExpressionRangeInfo>& expressionInfo = m_expressionInfo;
+    const Vector<ExpressionRangeInfo>& expressionInfo = m_expressionInfo;
 
     int low = 0;
@@ -214 +214 @@
         low = 1;
 
-    ExpressionRangeInfo& info = expressionInfo[low - 1];
+    const ExpressionRangeInfo& info = expressionInfo[low - 1];
     startOffset = info.startOffset;
     endOffset = info.endOffset;

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012-2015 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-2016 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -326 +326 @@
 
     void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot,
-        int& startOffset, int& endOffset, unsigned& line, unsigned& column);
+        int& startOffset, int& endOffset, unsigned& line, unsigned& column) const;
 
     bool typeProfilerExpressionInfoForBytecodeOffset(unsigned bytecodeOffset, unsigned& startDivot, unsigned& endDivot);
@@ -388 +388 @@
     }
 
-    void getLineAndColumn(ExpressionRangeInfo&, unsigned& line, unsigned& column);
+    void getLineAndColumn(const ExpressionRangeInfo&, unsigned& line, unsigned& column) const;
 
     int m_numParameters;

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -445 +445 @@
 }
 
-void StackFrame::computeLineAndColumn(unsigned& line, unsigned& column)
+void StackFrame::computeLineAndColumn(unsigned& line, unsigned& column) const
 {
     if (!codeBlock) {
@@ -463 +463 @@
 }
 
-String StackFrame::toString(VM& vm)
+String StackFrame::toString(VM& vm) const
 {
     StringBuilder traceBuild;

trunk/Source/JavaScriptCore/interpreter/Interpreter.h

@@ -91 +91 @@
         bool isNative() const { return !codeBlock; }
 
-        void computeLineAndColumn(unsigned& line, unsigned& column);
+        void computeLineAndColumn(unsigned& line, unsigned& column) const;
         String functionName(VM&) const;
         intptr_t sourceID() const;
         String sourceURL() const;
-        String toString(VM&);
+        String toString(VM&) const;
     };