<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[201896] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/201896">201896</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-06-09 17:42:19 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeExpressionRangeInfoh">trunk/Source/JavaScriptCore/bytecode/ExpressionRangeInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpreterh">trunk/Source/JavaScriptCore/interpreter/Interpreter.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201895 => 201896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-10 00:21:16 UTC (rev 201895)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-10 00:42:19 UTC (rev 201896)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-06-09 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> ES6: Reusing function name as a parameter name shouldn't throw Syntax Error
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (201895 => 201896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-06-10 00:21:16 UTC (rev 201895)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-06-10 00:42:19 UTC (rev 201896)
</span><span class="lines">@@ -3176,7 +3176,7 @@
</span><span class="cx"> return column;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column)
</del><ins>+void CodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column) const
</ins><span class="cx"> {
</span><span class="cx"> m_unlinkedCode->expressionRangeForBytecodeOffset(bytecodeOffset, divot, startOffset, endOffset, line, column);
</span><span class="cx"> divot += m_sourceOffset;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (201895 => 201896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-06-10 00:21:16 UTC (rev 201895)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-06-10 00:42:19 UTC (rev 201896)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> unsigned lineNumberForBytecodeOffset(unsigned bytecodeOffset);
</span><span class="cx"> unsigned columnNumberForBytecodeOffset(unsigned bytecodeOffset);
</span><span class="cx"> void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot,
</span><del>- int& startOffset, int& endOffset, unsigned& line, unsigned& column);
</del><ins>+ int& startOffset, int& endOffset, unsigned& line, unsigned& column) const;
</ins><span class="cx">
</span><span class="cx"> Optional<unsigned> bytecodeOffsetFromCallSiteIndex(CallSiteIndex);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeExpressionRangeInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ExpressionRangeInfo.h (201895 => 201896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ExpressionRangeInfo.h 2016-06-10 00:21:16 UTC (rev 201895)
+++ trunk/Source/JavaScriptCore/bytecode/ExpressionRangeInfo.h 2016-06-10 00:42:19 UTC (rev 201896)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2013, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -86,13 +86,13 @@
</span><span class="cx"> position = ((line & FatColumnModeLineMask) << FatColumnModeLineShift | (column & FatColumnModeColumnMask));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void decodeFatLineMode(unsigned& line, unsigned& column)
</del><ins>+ void decodeFatLineMode(unsigned& line, unsigned& column) const
</ins><span class="cx"> {
</span><span class="cx"> line = (position >> FatLineModeLineShift) & FatLineModeLineMask;
</span><span class="cx"> column = position & FatLineModeColumnMask;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void decodeFatColumnMode(unsigned& line, unsigned& column)
</del><ins>+ void decodeFatColumnMode(unsigned& line, unsigned& column) const
</ins><span class="cx"> {
</span><span class="cx"> line = (position >> FatColumnModeLineShift) & FatColumnModeLineMask;
</span><span class="cx"> column = position & FatColumnModeColumnMask;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (201895 => 201896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2016-06-10 00:21:16 UTC (rev 201895)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2016-06-10 00:42:19 UTC (rev 201896)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013, 2015 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2012-2013, 2015-2016 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> return line;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void UnlinkedCodeBlock::getLineAndColumn(ExpressionRangeInfo& info,
- unsigned& line, unsigned& column)
</del><ins>+inline void UnlinkedCodeBlock::getLineAndColumn(const ExpressionRangeInfo& info,
+ unsigned& line, unsigned& column) const
</ins><span class="cx"> {
</span><span class="cx"> switch (info.mode) {
</span><span class="cx"> case ExpressionRangeInfo::FatLineMode:
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void UnlinkedCodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset,
</span><del>- int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column)
</del><ins>+ int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(bytecodeOffset < instructions().count());
</span><span class="cx">
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<ExpressionRangeInfo>& expressionInfo = m_expressionInfo;
</del><ins>+ const Vector<ExpressionRangeInfo>& expressionInfo = m_expressionInfo;
</ins><span class="cx">
</span><span class="cx"> int low = 0;
</span><span class="cx"> int high = expressionInfo.size();
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> if (!low)
</span><span class="cx"> low = 1;
</span><span class="cx">
</span><del>- ExpressionRangeInfo& info = expressionInfo[low - 1];
</del><ins>+ const ExpressionRangeInfo& info = expressionInfo[low - 1];
</ins><span class="cx"> startOffset = info.startOffset;
</span><span class="cx"> endOffset = info.endOffset;
</span><span class="cx"> divot = info.divotPoint;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (201895 => 201896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2016-06-10 00:21:16 UTC (rev 201895)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2016-06-10 00:42:19 UTC (rev 201896)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2015 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2012-2016 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> int lineNumberForBytecodeOffset(unsigned bytecodeOffset);
</span><span class="cx">
</span><span class="cx"> void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot,
</span><del>- int& startOffset, int& endOffset, unsigned& line, unsigned& column);
</del><ins>+ int& startOffset, int& endOffset, unsigned& line, unsigned& column) const;
</ins><span class="cx">
</span><span class="cx"> bool typeProfilerExpressionInfoForBytecodeOffset(unsigned bytecodeOffset, unsigned& startDivot, unsigned& endDivot);
</span><span class="cx">
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> m_rareData = std::make_unique<RareData>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void getLineAndColumn(ExpressionRangeInfo&, unsigned& line, unsigned& column);
</del><ins>+ void getLineAndColumn(const ExpressionRangeInfo&, unsigned& line, unsigned& column) const;
</ins><span class="cx">
</span><span class="cx"> int m_numParameters;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (201895 => 201896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-06-10 00:21:16 UTC (rev 201895)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-06-10 00:42:19 UTC (rev 201896)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StackFrame::computeLineAndColumn(unsigned& line, unsigned& column)
</del><ins>+void StackFrame::computeLineAndColumn(unsigned& line, unsigned& column) const
</ins><span class="cx"> {
</span><span class="cx"> if (!codeBlock) {
</span><span class="cx"> line = 0;
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> line = executable->overrideLineNumber();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String StackFrame::toString(VM& vm)
</del><ins>+String StackFrame::toString(VM& vm) const
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder traceBuild;
</span><span class="cx"> String functionName = this->functionName(vm);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.h (201895 => 201896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-06-10 00:21:16 UTC (rev 201895)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-06-10 00:42:19 UTC (rev 201896)
</span><span class="lines">@@ -90,11 +90,11 @@
</span><span class="cx">
</span><span class="cx"> bool isNative() const { return !codeBlock; }
</span><span class="cx">
</span><del>- void computeLineAndColumn(unsigned& line, unsigned& column);
</del><ins>+ void computeLineAndColumn(unsigned& line, unsigned& column) const;
</ins><span class="cx"> String functionName(VM&) const;
</span><span class="cx"> intptr_t sourceID() const;
</span><span class="cx"> String sourceURL() const;
</span><del>- String toString(VM&);
</del><ins>+ String toString(VM&) const;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class SuspendExceptionScope {
</span></span></pre>
</div>
</div>
</body>
</html>