<!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>[162389] 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/162389">162389</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 16:45:05 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removing CodeBlock::opDebugBytecodeOffsetForLineAndColumn() and friends.
<https://webkit.org/b/127321>
Reviewed by Geoffrey Garen.
We're changing plans and will be going with CodeBlock level breakpoints
instead of bytecode level breakpoints. As a result, we no longer need
the services of CodeBlock::opDebugBytecodeOffsetForLineAndColumn() (and
friends). This patch will remove that unused code.
* GNUmakefile.list.am:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bytecode/CodeBlock.cpp:
* bytecode/CodeBlock.h:
* bytecode/LineColumnInfo.h: Removed.
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::UnlinkedCodeBlock::dumpExpressionRangeInfo):
* bytecode/UnlinkedCodeBlock.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefilelistam">trunk/Source/JavaScriptCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</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="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorebytecodeLineColumnInfoh">trunk/Source/JavaScriptCore/bytecode/LineColumnInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-20 Mark Lam <mark.lam@apple.com>
+
+ Removing CodeBlock::opDebugBytecodeOffsetForLineAndColumn() and friends.
+ <https://webkit.org/b/127321>
+
+ Reviewed by Geoffrey Garen.
+
+ We're changing plans and will be going with CodeBlock level breakpoints
+ instead of bytecode level breakpoints. As a result, we no longer need
+ the services of CodeBlock::opDebugBytecodeOffsetForLineAndColumn() (and
+ friends). This patch will remove that unused code.
+
+ * GNUmakefile.list.am:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * bytecode/CodeBlock.cpp:
+ * bytecode/CodeBlock.h:
+ * bytecode/LineColumnInfo.h: Removed.
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedCodeBlock::dumpExpressionRangeInfo):
+ * bytecode/UnlinkedCodeBlock.h:
+
</ins><span class="cx"> 2014-01-20 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> CodeBlockSet::traceMarked doesn't need to visit the ownerExecutable
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.list.am (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.list.am 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/GNUmakefile.list.am 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -152,7 +152,6 @@
</span><span class="cx"> Source/JavaScriptCore/bytecode/LLIntCallLinkInfo.h \
</span><span class="cx"> Source/JavaScriptCore/bytecode/LazyOperandValueProfile.cpp \
</span><span class="cx"> Source/JavaScriptCore/bytecode/LazyOperandValueProfile.h \
</span><del>- Source/JavaScriptCore/bytecode/LineColumnInfo.h \
</del><span class="cx"> Source/JavaScriptCore/bytecode/MethodOfGettingAValueProfile.cpp \
</span><span class="cx"> Source/JavaScriptCore/bytecode/MethodOfGettingAValueProfile.h \
</span><span class="cx"> Source/JavaScriptCore/bytecode/ObjectAllocationProfile.h \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -816,7 +816,6 @@
</span><span class="cx"> <ClInclude Include="..\bytecode\Instruction.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\JumpTable.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\LazyOperandValueProfile.h" />
</span><del>- <ClInclude Include="..\bytecode\LineColumnInfo.h" />
</del><span class="cx"> <ClInclude Include="..\bytecode\LLIntCallLinkInfo.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\MethodOfGettingAValueProfile.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\Opcode.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -1502,9 +1502,6 @@
</span><span class="cx"> <ClInclude Include="..\bytecode\LazyOperandValueProfile.h">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\bytecode\LineColumnInfo.h">
- <Filter>bytecode</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\bytecode\LLIntCallLinkInfo.h">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -1312,7 +1312,6 @@
</span><span class="cx"> E49DC16D12EF295300184A1F /* SourceProviderCacheItem.h in Headers */ = {isa = PBXBuildFile; fileRef = E49DC14912EF261A00184A1F /* SourceProviderCacheItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE20CE9D15F04A9500DF3430 /* LLIntCLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE20CE9B15F04A9500DF3430 /* LLIntCLoop.cpp */; };
</span><span class="cx"> FE20CE9E15F04A9500DF3430 /* LLIntCLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = FE20CE9C15F04A9500DF3430 /* LLIntCLoop.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- FE37DD56183C1E880018B2F0 /* LineColumnInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = FE37DD55183C1E880018B2F0 /* LineColumnInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> FE4A331F15BD2E07006F54F3 /* VMInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE4A331D15BD2E07006F54F3 /* VMInspector.cpp */; };
</span><span class="cx"> FE4A332015BD2E07006F54F3 /* VMInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = FE4A331E15BD2E07006F54F3 /* VMInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5932A5183C5A2600A1ECCC /* VMEntryScope.cpp */; };
</span><span class="lines">@@ -2722,7 +2721,6 @@
</span><span class="cx"> F692A8870255597D01FF60F7 /* JSCJSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCJSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="cx"> FE20CE9B15F04A9500DF3430 /* LLIntCLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLIntCLoop.cpp; path = llint/LLIntCLoop.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE20CE9C15F04A9500DF3430 /* LLIntCLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLIntCLoop.h; path = llint/LLIntCLoop.h; sourceTree = "<group>"; };
</span><del>- FE37DD55183C1E880018B2F0 /* LineColumnInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineColumnInfo.h; sourceTree = "<group>"; };
</del><span class="cx"> FE4A331D15BD2E07006F54F3 /* VMInspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VMInspector.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE4A331E15BD2E07006F54F3 /* VMInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMInspector.h; sourceTree = "<group>"; };
</span><span class="cx"> FE5932A5183C5A2600A1ECCC /* VMEntryScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VMEntryScope.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4230,7 +4228,6 @@
</span><span class="cx"> 969A078F0ED1D3AE00F1F681 /* bytecode */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- FE37DD55183C1E880018B2F0 /* LineColumnInfo.h */,
</del><span class="cx"> 0F8335B41639C1E3001443B5 /* ArrayAllocationProfile.cpp */,
</span><span class="cx"> 0F8335B51639C1E3001443B5 /* ArrayAllocationProfile.h */,
</span><span class="cx"> 0F63945115D07051006A597C /* ArrayProfile.cpp */,
</span><span class="lines">@@ -4471,7 +4468,6 @@
</span><span class="cx"> C2FCAE1117A9C24E0034C735 /* BytecodeBasicBlock.h in Headers */,
</span><span class="cx"> A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */,
</span><span class="cx"> C2FCAE1317A9C24E0034C735 /* BytecodeLivenessAnalysis.h in Headers */,
</span><del>- FE37DD56183C1E880018B2F0 /* LineColumnInfo.h in Headers */,
</del><span class="cx"> 0F8335B81639C1EA001443B5 /* ArrayAllocationProfile.h in Headers */,
</span><span class="cx"> A5840E29187CA5E600843B10 /* inline-and-minify-stylesheets-and-scripts.py in Headers */,
</span><span class="cx"> A5840E2B187CA75B00843B10 /* jsmin.py in Headers */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -2564,23 +2564,6 @@
</span><span class="cx"> line += m_ownerExecutable->lineNo();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned CodeBlock::opDebugBytecodeOffsetForLineAndColumn(unsigned& line, unsigned& column)
-{
- unsigned lineAdjustment = m_ownerExecutable->lineNo();
- ASSERT(line >= lineAdjustment);
- unsigned unlinkedLine = line - lineAdjustment;
- unsigned columnAdjustment = unlinkedLine ? 1 : firstLineColumnOffset();
- ASSERT(column >= columnAdjustment);
- unsigned unlinkedColumn = column - columnAdjustment;
-
- unsigned bytecodeOffset = m_unlinkedCode->opDebugBytecodeOffsetForLineAndColumn(unlinkedLine, unlinkedColumn);
- if (bytecodeOffset != static_cast<unsigned>(WTF::notFound)) {
- line = unlinkedLine + lineAdjustment;
- column = unlinkedColumn + (unlinkedLine ? 1 : firstLineColumnOffset());
- }
- return bytecodeOffset;
-}
-
</del><span class="cx"> void CodeBlock::shrinkToFit(ShrinkMode shrinkMode)
</span><span class="cx"> {
</span><span class="cx"> m_rareCaseProfiles.shrinkToFit();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -174,7 +174,6 @@
</span><span class="cx"> unsigned columnNumberForBytecodeOffset(unsigned bytecodeOffset);
</span><span class="cx"> void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot,
</span><span class="cx"> int& startOffset, int& endOffset, unsigned& line, unsigned& column);
</span><del>- unsigned opDebugBytecodeOffsetForLineAndColumn(unsigned& line, unsigned& column);
</del><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> StructureStubInfo* addStubInfo();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeLineColumnInfoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/bytecode/LineColumnInfo.h (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/LineColumnInfo.h 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/bytecode/LineColumnInfo.h 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -1,97 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef LineColumnInfo_h
-#define LineColumnInfo_h
-
-namespace JSC {
-
-struct LineColumnInfo {
- unsigned instructionOffset;
- unsigned line;
- unsigned column;
-
- bool operator <(const LineColumnInfo& other) const
- {
- if (line == other.line) {
- if (column == other.column)
- return instructionOffset < other.instructionOffset;
- return column < other.column;
- }
- return line < other.line;
- }
-
- struct LineColumnPair {
- LineColumnPair(unsigned line, unsigned column)
- : line(line), column(column)
- {
- }
-
- unsigned line;
- unsigned column;
- };
-
- bool operator ==(const LineColumnPair& pair) const
- {
- return (line == pair.line) && (column == pair.column);
- }
-
- bool operator !=(const LineColumnPair& pair) const
- {
- return (line != pair.line) || (column != pair.column);
- }
-
- bool operator <(const LineColumnPair& pair) const
- {
- if (line == pair.line)
- return column < pair.column;
- return line < pair.line;
- }
-
- bool operator <=(const LineColumnPair& pair) const
- {
- if (line == pair.line)
- return column <= pair.column;
- return line < pair.line;
- }
-
- bool operator >(const LineColumnPair& pair) const
- {
- if (line == pair.line)
- return column > pair.column;
- return line > pair.line;
- }
-
- bool operator >=(const LineColumnPair& pair) const
- {
- if (line == pair.line)
- return column >= pair.column;
- return line > pair.line;
- }
-};
-
-} // namespace JSC
-
-#endif // LineColumnInfo_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -310,19 +310,6 @@
</span><span class="cx"> }
</span><span class="cx"> dataLog("}\n");
</span><span class="cx"> }
</span><del>-
-void UnlinkedCodeBlock::dumpOpDebugLineColumnInfoList()
-{
- LineColumnInfoList& infoList = this->opDebugLineColumnInfoList();
- size_t size = infoList.size();
-
- dataLogF("UnlinkedCodeBlock %p opDebugLineColumnInfoList[%zu] {\n", this, size);
- for (size_t i = 0; i < size; i++) {
- LineColumnInfo& info = infoList[i];
- dumpLineColumnEntry(i, instructions(), info.instructionOffset, info.line, info.column);
- }
- dataLog("}\n");
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void UnlinkedCodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset,
</span><span class="lines">@@ -361,77 +348,6 @@
</span><span class="cx"> getLineAndColumn(info, line, column);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned UnlinkedCodeBlock::opDebugBytecodeOffsetForLineAndColumn(unsigned& line, unsigned& column)
-{
- if (!m_expressionInfo.size())
- return static_cast<unsigned>(WTF::notFound);
-
- LineColumnInfo::LineColumnPair target(line, column);
- LineColumnInfoList& list = opDebugLineColumnInfoList();
-
- // Find the earliest op_debug bytecode whose line and column matches the
- // target line and column values. If an exact match is not found, then
- // find the nearest op_debug bytecode that precedes the target line and
- // column values. If there are more than one op_debug at that preceding
- // line and column value, then select the earliest of those.
- //
- // We want the earliest one because when we have multiple op_debug bytecodes
- // that map to a given line and column, a debugger user would expect to break
- // on the first one and step through the rest thereafter if needed.
-
- LineColumnInfoList::iterator it = std::lower_bound(list.begin(), list.end(), target);
- if (it == list.end() || *it > target)
- --it;
- ASSERT(it >= list.begin() && it < list.end() && *it <= target);
- ASSERT(it == list.begin() || *(it - 1) < *it);
-
- line = it->line;
- column = it->column;
-
- unsigned offset = it->instructionOffset;
- ASSERT(instructions()[offset].u.opcode == op_debug);
-
- return offset;
-}
-
-static bool compareLineColumnInfo(const LineColumnInfo& first, const LineColumnInfo& second)
-{
- return first < second;
-}
-
-UnlinkedCodeBlock::LineColumnInfoList& UnlinkedCodeBlock::opDebugLineColumnInfoList()
-{
- createRareDataIfNecessary();
-
- if (m_rareData->m_opDebugLineColumnInfoList) {
- ASSERT(m_rareData->m_opDebugLineColumnInfoList->size() <= m_expressionInfo.size());
- return *m_rareData->m_opDebugLineColumnInfoList;
- }
-
- Vector<ExpressionRangeInfo>& expressionInfo = m_expressionInfo;
- size_t size = m_expressionInfo.size();
-
- m_rareData->m_opDebugLineColumnInfoList = std::make_unique<LineColumnInfoList>();
- LineColumnInfoList& infoList = *m_rareData->m_opDebugLineColumnInfoList;
-
- for (size_t src = 0; src < size; src++) {
- ExpressionRangeInfo& exprInfo = expressionInfo[src];
- unsigned instructionOffset = exprInfo.instructionOffset;
- OpcodeID opcode = instructions()[instructionOffset].u.opcode;
- if (opcode == op_debug) {
- LineColumnInfo info;
- info.instructionOffset = instructionOffset;
- getLineAndColumn(exprInfo, info.line, info.column);
- infoList.append(info);
- }
- }
- infoList.shrinkToFit();
-
- std::sort(infoList.begin(), infoList.end(), compareLineColumnInfo);
-
- return *m_rareData->m_opDebugLineColumnInfoList.get();
-}
-
</del><span class="cx"> void UnlinkedCodeBlock::addExpressionInfo(unsigned instructionOffset,
</span><span class="cx"> int divot, int startOffset, int endOffset, unsigned line, unsigned column)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (162388 => 162389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2014-01-21 00:41:41 UTC (rev 162388)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2014-01-21 00:45:05 UTC (rev 162389)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "Identifier.h"
</span><span class="cx"> #include "JSCell.h"
</span><span class="cx"> #include "JSString.h"
</span><del>-#include "LineColumnInfo.h"
</del><span class="cx"> #include "ParserModes.h"
</span><span class="cx"> #include "RegExp.h"
</span><span class="cx"> #include "SpecialPointer.h"
</span><span class="lines">@@ -42,7 +41,6 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Compression.h>
</span><span class="cx"> #include <wtf/RefCountedArray.h>
</span><del>-#include <wtf/StdLibExtras.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -445,7 +443,6 @@
</span><span class="cx">
</span><span class="cx"> void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot,
</span><span class="cx"> int& startOffset, int& endOffset, unsigned& line, unsigned& column);
</span><del>- unsigned opDebugBytecodeOffsetForLineAndColumn(unsigned& line, unsigned& column);
</del><span class="cx">
</span><span class="cx"> void recordParse(CodeFeatures features, bool hasCapturedVariables, unsigned firstLine, unsigned lineCount, unsigned endColumn)
</span><span class="cx"> {
</span><span class="lines">@@ -465,7 +462,6 @@
</span><span class="cx"> unsigned endColumn() const { return m_endColumn; }
</span><span class="cx">
</span><span class="cx"> void dumpExpressionRangeInfo(); // For debugging purpose only.
</span><del>- void dumpOpDebugLineColumnInfoList(); // For debugging purpose only.
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> UnlinkedCodeBlock(VM*, Structure*, CodeType, const ExecutableInfo&);
</span><span class="lines">@@ -489,9 +485,6 @@
</span><span class="cx">
</span><span class="cx"> void getLineAndColumn(ExpressionRangeInfo&, unsigned& line, unsigned& column);
</span><span class="cx">
</span><del>- typedef Vector<LineColumnInfo> LineColumnInfoList;
- LineColumnInfoList& opDebugLineColumnInfoList();
-
</del><span class="cx"> RefCountedArray<UnlinkedInstruction> m_unlinkedInstructions;
</span><span class="cx">
</span><span class="cx"> int m_numParameters;
</span><span class="lines">@@ -556,7 +549,6 @@
</span><span class="cx"> Vector<UnlinkedStringJumpTable> m_stringSwitchJumpTables;
</span><span class="cx">
</span><span class="cx"> Vector<ExpressionRangeInfo::FatPosition> m_expressionInfoFatPositions;
</span><del>- std::unique_ptr<LineColumnInfoList> m_opDebugLineColumnInfoList;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>