<!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>[209220] 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/209220">209220</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 16:24:17 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>SourceCodeKey should use unlinked source code
https://bugs.webkit.org/show_bug.cgi?id=165286
Reviewed by Saam Barati.
This patch splits out UnlinkedSourceCode from SourceCode, and deploys
UnlinkedSourceCode in SourceCodeKey.
It's misleading to store SourceCode in SourceCodeKey because SourceCode
has an absolute location whereas unlinked cached code has no location.
I plan to deploy UnlinkedSourceCode in more places, to indicate code
that has no absolute location.
* JavaScriptCore.xcodeproj/project.pbxproj:
* parser/SourceCode.cpp:
(JSC::UnlinkedSourceCode::toUTF8):
(JSC::SourceCode::toUTF8): Deleted.
* parser/SourceCode.h:
(JSC::SourceCode::SourceCode):
(JSC::SourceCode::startColumn):
(JSC::SourceCode::isHashTableDeletedValue): Deleted.
(JSC::SourceCode::hash): Deleted.
(JSC::SourceCode::view): Deleted.
(JSC::SourceCode::providerID): Deleted.
(JSC::SourceCode::isNull): Deleted.
(JSC::SourceCode::provider): Deleted.
(JSC::SourceCode::startOffset): Deleted.
(JSC::SourceCode::endOffset): Deleted.
(JSC::SourceCode::length): Deleted. Move a bunch of stuff in to a new
base class, UnlinkedSourceCode.
* parser/SourceCodeKey.h:
(JSC::SourceCodeKey::SourceCodeKey): Use UnlinkedSourceCode since code
in the cache has no location.
* parser/UnlinkedSourceCode.h: Copied from Source/JavaScriptCore/parser/SourceCode.h.
(JSC::UnlinkedSourceCode::UnlinkedSourceCode):
(JSC::UnlinkedSourceCode::provider):
(JSC::SourceCode::SourceCode): Deleted.
(JSC::SourceCode::isHashTableDeletedValue): Deleted.
(JSC::SourceCode::hash): Deleted.
(JSC::SourceCode::view): Deleted.
(JSC::SourceCode::providerID): Deleted.
(JSC::SourceCode::isNull): Deleted.
(JSC::SourceCode::provider): Deleted.
(JSC::SourceCode::firstLine): Deleted.
(JSC::SourceCode::startColumn): Deleted.
(JSC::SourceCode::startOffset): Deleted.
(JSC::SourceCode::endOffset): Deleted.
(JSC::SourceCode::length): Deleted.
(JSC::makeSource): Deleted.
(JSC::SourceCode::subExpression): Deleted.
* runtime/CodeCache.h: Use UnlinkedSourceCode in the cache.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceCodeh">trunk/Source/JavaScriptCore/parser/SourceCode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceCodeKeyh">trunk/Source/JavaScriptCore/parser/SourceCodeKey.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCacheh">trunk/Source/JavaScriptCore/runtime/CodeCache.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreparserUnlinkedSourceCodecpp">trunk/Source/JavaScriptCore/parser/UnlinkedSourceCode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserUnlinkedSourceCodeh">trunk/Source/JavaScriptCore/parser/UnlinkedSourceCode.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreparserSourceCodecpp">trunk/Source/JavaScriptCore/parser/SourceCode.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (209219 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-12-02 00:04:13 UTC (rev 209219)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -623,9 +623,9 @@
</span><span class="cx"> parser/NodesAnalyzeModule.cpp
</span><span class="cx"> parser/Parser.cpp
</span><span class="cx"> parser/ParserArena.cpp
</span><del>- parser/SourceCode.cpp
</del><span class="cx"> parser/SourceProvider.cpp
</span><span class="cx"> parser/SourceProviderCache.cpp
</span><ins>+ parser/UnlinkedSourceCode.cpp
</ins><span class="cx"> parser/VariableEnvironment.cpp
</span><span class="cx">
</span><span class="cx"> profiler/ProfilerBytecode.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209219 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-02 00:04:13 UTC (rev 209219)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2016-12-01 Geoffrey Garen <ggaren@apple.com>
+
+ SourceCodeKey should use unlinked source code
+ https://bugs.webkit.org/show_bug.cgi?id=165286
+
+ Reviewed by Saam Barati.
+
+ This patch splits out UnlinkedSourceCode from SourceCode, and deploys
+ UnlinkedSourceCode in SourceCodeKey.
+
+ It's misleading to store SourceCode in SourceCodeKey because SourceCode
+ has an absolute location whereas unlinked cached code has no location.
+
+ I plan to deploy UnlinkedSourceCode in more places, to indicate code
+ that has no absolute location.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * parser/SourceCode.cpp:
+ (JSC::UnlinkedSourceCode::toUTF8):
+ (JSC::SourceCode::toUTF8): Deleted.
+ * parser/SourceCode.h:
+ (JSC::SourceCode::SourceCode):
+ (JSC::SourceCode::startColumn):
+ (JSC::SourceCode::isHashTableDeletedValue): Deleted.
+ (JSC::SourceCode::hash): Deleted.
+ (JSC::SourceCode::view): Deleted.
+ (JSC::SourceCode::providerID): Deleted.
+ (JSC::SourceCode::isNull): Deleted.
+ (JSC::SourceCode::provider): Deleted.
+ (JSC::SourceCode::startOffset): Deleted.
+ (JSC::SourceCode::endOffset): Deleted.
+ (JSC::SourceCode::length): Deleted. Move a bunch of stuff in to a new
+ base class, UnlinkedSourceCode.
+
+ * parser/SourceCodeKey.h:
+ (JSC::SourceCodeKey::SourceCodeKey): Use UnlinkedSourceCode since code
+ in the cache has no location.
+
+ * parser/UnlinkedSourceCode.h: Copied from Source/JavaScriptCore/parser/SourceCode.h.
+ (JSC::UnlinkedSourceCode::UnlinkedSourceCode):
+ (JSC::UnlinkedSourceCode::provider):
+ (JSC::SourceCode::SourceCode): Deleted.
+ (JSC::SourceCode::isHashTableDeletedValue): Deleted.
+ (JSC::SourceCode::hash): Deleted.
+ (JSC::SourceCode::view): Deleted.
+ (JSC::SourceCode::providerID): Deleted.
+ (JSC::SourceCode::isNull): Deleted.
+ (JSC::SourceCode::provider): Deleted.
+ (JSC::SourceCode::firstLine): Deleted.
+ (JSC::SourceCode::startColumn): Deleted.
+ (JSC::SourceCode::startOffset): Deleted.
+ (JSC::SourceCode::endOffset): Deleted.
+ (JSC::SourceCode::length): Deleted.
+ (JSC::makeSource): Deleted.
+ (JSC::SourceCode::subExpression): Deleted.
+
+ * runtime/CodeCache.h: Use UnlinkedSourceCode in the cache.
+
</ins><span class="cx"> 2016-12-01 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Add wasm int to floating point opcodes
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (209219 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-12-02 00:04:13 UTC (rev 209219)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> 0F8F2B96172E04A3007DBDA5 /* FTLLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F8F2B94172E049E007DBDA5 /* FTLLink.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F8F2B99172F04FF007DBDA5 /* DFGDesiredIdentifiers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F8F2B97172F04FD007DBDA5 /* DFGDesiredIdentifiers.cpp */; };
</span><span class="cx"> 0F8F2B9A172F0501007DBDA5 /* DFGDesiredIdentifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F8F2B98172F04FD007DBDA5 /* DFGDesiredIdentifiers.h */; };
</span><del>- 0F8F2B9E17306C8D007DBDA5 /* SourceCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F8F2B9D17306C8B007DBDA5 /* SourceCode.cpp */; };
</del><ins>+ 0F8F2B9E17306C8D007DBDA5 /* UnlinkedSourceCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F8F2B9D17306C8B007DBDA5 /* UnlinkedSourceCode.cpp */; };
</ins><span class="cx"> 0F8F943C1667631300D61971 /* CodeSpecializationKind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F8F943A1667631100D61971 /* CodeSpecializationKind.cpp */; };
</span><span class="cx"> 0F8F94401667633000D61971 /* CodeBlockHash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F8F943D1667632D00D61971 /* CodeBlockHash.cpp */; };
</span><span class="cx"> 0F8F94411667633200D61971 /* CodeBlockHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F8F943E1667632D00D61971 /* CodeBlockHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1018,6 +1018,7 @@
</span><span class="cx"> 141448CB13A176EC00F5BA1A /* MarkedBlockSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 141448CA13A176EC00F5BA1A /* MarkedBlockSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 141448CD13A1783700F5BA1A /* TinyBloomFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 141448CC13A1783700F5BA1A /* TinyBloomFilter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14150133154BB13F005D8C98 /* WeakSetInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 14150132154BB13F005D8C98 /* WeakSetInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 14201D591DECF26A00904BD3 /* SourceCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 14201D581DECF26A00904BD3 /* SourceCode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1421359A0A677F4F00A8195E /* JSBase.cpp */; };
</span><span class="cx"> 14280823107EC02C0013E7B2 /* Debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8580255597D01FF60F7 /* Debugger.cpp */; };
</span><span class="cx"> 1428082D107EC0570013E7B2 /* CallData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA62DFE0E2826230004F30D /* CallData.cpp */; };
</span><span class="lines">@@ -1149,6 +1150,7 @@
</span><span class="cx"> 148F21BC107EC54D0042EC2C /* Parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F0B3A909BB4DC00068FCE3 /* Parser.cpp */; };
</span><span class="cx"> 149559EE0DDCDDF700648087 /* DebuggerCallFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 149559ED0DDCDDF700648087 /* DebuggerCallFrame.cpp */; };
</span><span class="cx"> 14A1563210966365006FA260 /* DateInstanceCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A1563010966365006FA260 /* DateInstanceCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 14AB66761DECF40900A56C26 /* UnlinkedSourceCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 14AB66751DECF40900A56C26 /* UnlinkedSourceCode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 14ABDF600A437FEF00ECCA01 /* JSCallbackObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14ABDF5E0A437FEF00ECCA01 /* JSCallbackObject.cpp */; };
</span><span class="cx"> 14AD910C1DCA92940014F9FE /* EvalCodeBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = 14AD91061DCA92940014F9FE /* EvalCodeBlock.h */; };
</span><span class="cx"> 14AD910D1DCA92940014F9FE /* FunctionCodeBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = 14AD91071DCA92940014F9FE /* FunctionCodeBlock.h */; };
</span><span class="lines">@@ -2082,7 +2084,6 @@
</span><span class="cx"> BC18C45D0E16F5CD00B34460 /* Register.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B24FF0D8AF6D1009CB8C7 /* Register.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC18C45E0E16F5CD00B34460 /* CLoopStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D792640DAA03FB001A9F05 /* CLoopStack.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC18C4630E16F5CD00B34460 /* SourceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E866ED0DD59AFA00A2B2A1 /* SourceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC18C4640E16F5CD00B34460 /* SourceCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E866EE0DD59AFA00A2B2A1 /* SourceCode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> BC18C4660E16F5CD00B34460 /* StringConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC18C3C10E16EE3300B34460 /* StringConstructor.h */; };
</span><span class="cx"> BC18C4680E16F5CD00B34460 /* StringObject.h in Headers */ = {isa = PBXBuildFile; fileRef = BC18C3C30E16EE3300B34460 /* StringObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC18C46A0E16F5CD00B34460 /* StringPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = BC18C3C60E16EE3300B34460 /* StringPrototype.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2949,7 +2950,7 @@
</span><span class="cx"> 0F8F2B94172E049E007DBDA5 /* FTLLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FTLLink.h; path = ftl/FTLLink.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F8F2B97172F04FD007DBDA5 /* DFGDesiredIdentifiers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DFGDesiredIdentifiers.cpp; path = dfg/DFGDesiredIdentifiers.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F8F2B98172F04FD007DBDA5 /* DFGDesiredIdentifiers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DFGDesiredIdentifiers.h; path = dfg/DFGDesiredIdentifiers.h; sourceTree = "<group>"; };
</span><del>- 0F8F2B9D17306C8B007DBDA5 /* SourceCode.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SourceCode.cpp; sourceTree = "<group>"; };
</del><ins>+ 0F8F2B9D17306C8B007DBDA5 /* UnlinkedSourceCode.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnlinkedSourceCode.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 0F8F943A1667631100D61971 /* CodeSpecializationKind.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CodeSpecializationKind.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F8F943D1667632D00D61971 /* CodeBlockHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CodeBlockHash.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F8F943E1667632D00D61971 /* CodeBlockHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeBlockHash.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3424,6 +3425,7 @@
</span><span class="cx"> 141448CA13A176EC00F5BA1A /* MarkedBlockSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkedBlockSet.h; sourceTree = "<group>"; };
</span><span class="cx"> 141448CC13A1783700F5BA1A /* TinyBloomFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TinyBloomFilter.h; sourceTree = "<group>"; };
</span><span class="cx"> 14150132154BB13F005D8C98 /* WeakSetInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakSetInlines.h; sourceTree = "<group>"; };
</span><ins>+ 14201D581DECF26A00904BD3 /* SourceCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceCode.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1421359A0A677F4F00A8195E /* JSBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 142711380A460BBB0080EEEA /* JSBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBase.h; sourceTree = "<group>"; };
</span><span class="cx"> 1429D77B0ED20D7300B89619 /* Interpreter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Interpreter.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3510,6 +3512,7 @@
</span><span class="cx"> 149DAAF212EB559D0083B12B /* ConservativeRoots.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConservativeRoots.h; sourceTree = "<group>"; };
</span><span class="cx"> 14A1563010966365006FA260 /* DateInstanceCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateInstanceCache.h; sourceTree = "<group>"; };
</span><span class="cx"> 14A396A60CD2933100B5B4FF /* SymbolTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolTable.h; sourceTree = "<group>"; };
</span><ins>+ 14AB66751DECF40900A56C26 /* UnlinkedSourceCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnlinkedSourceCode.h; sourceTree = "<group>"; };
</ins><span class="cx"> 14ABB36E099C076400E2A24F /* JSCJSValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCJSValue.h; sourceTree = "<group>"; };
</span><span class="cx"> 14ABB454099C2A0F00E2A24F /* JSType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSType.h; sourceTree = "<group>"; };
</span><span class="cx"> 14ABDF5D0A437FEF00ECCA01 /* JSCallbackObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackObject.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3762,7 +3765,6 @@
</span><span class="cx"> 65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSWrapperObject.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSWrapperObject.h; sourceTree = "<group>"; };
</span><span class="cx"> 65E866ED0DD59AFA00A2B2A1 /* SourceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceProvider.h; sourceTree = "<group>"; };
</span><del>- 65E866EE0DD59AFA00A2B2A1 /* SourceCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceCode.h; sourceTree = "<group>"; };
</del><span class="cx"> 65EA4C99092AF9E20093D800 /* JSLock.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSLock.cpp; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="cx"> 65EA4C9A092AF9E20093D800 /* JSLock.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSLock.h; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="cx"> 65EA73620BAE35D1001BB560 /* CommonIdentifiers.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CommonIdentifiers.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -6038,6 +6040,7 @@
</span><span class="cx"> F692A8660255597D01FF60F7 /* Lexer.h */,
</span><span class="cx"> E3794E731B77EB97005543AE /* ModuleAnalyzer.cpp */,
</span><span class="cx"> E3794E741B77EB97005543AE /* ModuleAnalyzer.h */,
</span><ins>+ 000BEAF0DF604481AF6AB68C /* ModuleScopeData.h */,
</ins><span class="cx"> 930DAD030FB1EB1A0082D205 /* NodeConstructors.h */,
</span><span class="cx"> F692A86D0255597D01FF60F7 /* Nodes.cpp */,
</span><span class="cx"> F692A86E0255597D01FF60F7 /* Nodes.h */,
</span><span class="lines">@@ -6051,8 +6054,8 @@
</span><span class="cx"> A77F18241641925400640A47 /* ParserModes.h */,
</span><span class="cx"> 65303D631447B9E100D3F904 /* ParserTokens.h */,
</span><span class="cx"> 869EBCB60E8C6D4A008722CC /* ResultType.h */,
</span><del>- 0F8F2B9D17306C8B007DBDA5 /* SourceCode.cpp */,
- 65E866EE0DD59AFA00A2B2A1 /* SourceCode.h */,
</del><ins>+ 0F8F2B9D17306C8B007DBDA5 /* UnlinkedSourceCode.cpp */,
+ 14201D581DECF26A00904BD3 /* SourceCode.h */,
</ins><span class="cx"> 70B7918E1C0244C9002481E2 /* SourceCodeKey.h */,
</span><span class="cx"> 0F493AF816D0CAD10084508B /* SourceProvider.cpp */,
</span><span class="cx"> 65E866ED0DD59AFA00A2B2A1 /* SourceProvider.h */,
</span><span class="lines">@@ -6060,9 +6063,9 @@
</span><span class="cx"> E49DC15112EF272200184A1F /* SourceProviderCache.h */,
</span><span class="cx"> E49DC14912EF261A00184A1F /* SourceProviderCacheItem.h */,
</span><span class="cx"> A7A7EE7711B98B8D0065A14F /* SyntaxChecker.h */,
</span><ins>+ 14AB66751DECF40900A56C26 /* UnlinkedSourceCode.h */,
</ins><span class="cx"> 79EE0BFD1B4AFB85000385C9 /* VariableEnvironment.cpp */,
</span><span class="cx"> 79EE0BFE1B4AFB85000385C9 /* VariableEnvironment.h */,
</span><del>- 000BEAF0DF604481AF6AB68C /* ModuleScopeData.h */,
</del><span class="cx"> );
</span><span class="cx"> path = parser;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -8099,6 +8102,7 @@
</span><span class="cx"> A7D89CFE17A0B8CC00773AD8 /* DFGOSRAvailabilityAnalysisPhase.h in Headers */,
</span><span class="cx"> 0FD82E57141DAF1000179C94 /* DFGOSREntry.h in Headers */,
</span><span class="cx"> 0F40E4A71C497F7400A577FA /* AirOpcode.h in Headers */,
</span><ins>+ 14AB66761DECF40900A56C26 /* UnlinkedSourceCode.h in Headers */,
</ins><span class="cx"> 0FDF67D71D9DC442001B9825 /* AirKind.h in Headers */,
</span><span class="cx"> 0FD8A32617D51F5700CA2C40 /* DFGOSREntrypointCreationPhase.h in Headers */,
</span><span class="cx"> 0FC0976A1468A6F700CF2442 /* DFGOSRExit.h in Headers */,
</span><span class="lines">@@ -8778,6 +8782,7 @@
</span><span class="cx"> 86158AB3155C8B4000B45C9C /* PropertyName.h in Headers */,
</span><span class="cx"> BC18C4540E16F5CD00B34460 /* PropertyNameArray.h in Headers */,
</span><span class="cx"> 0FF7168C15A3B235008F5DAA /* PropertyOffset.h in Headers */,
</span><ins>+ 14201D591DECF26A00904BD3 /* SourceCode.h in Headers */,
</ins><span class="cx"> BC18C4550E16F5CD00B34460 /* PropertySlot.h in Headers */,
</span><span class="cx"> 0FB7F39C15ED8E4600F167B2 /* PropertyStorage.h in Headers */,
</span><span class="cx"> 53FA2AE11CF37F3F0022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.h in Headers */,
</span><span class="lines">@@ -8853,7 +8858,6 @@
</span><span class="cx"> C2160FE715F7E95E00942DFC /* SlotVisitorInlines.h in Headers */,
</span><span class="cx"> A709F2F017A0AC0400512E98 /* SlowPathCall.h in Headers */,
</span><span class="cx"> 933040040E6A749400786E6A /* SmallStrings.h in Headers */,
</span><del>- BC18C4640E16F5CD00B34460 /* SourceCode.h in Headers */,
</del><span class="cx"> 0F7C39FD1C8F659500480151 /* RegExpObjectInlines.h in Headers */,
</span><span class="cx"> 0F7CF9521DC027D90098CC12 /* StopIfNecessaryTimer.h in Headers */,
</span><span class="cx"> BC18C4630E16F5CD00B34460 /* SourceProvider.h in Headers */,
</span><span class="lines">@@ -10306,7 +10310,7 @@
</span><span class="cx"> 0F2B670417B6B5AB00A7AE3F /* SimpleTypedArrayController.cpp in Sources */,
</span><span class="cx"> C225494315F7DBAA0065E898 /* SlotVisitor.cpp in Sources */,
</span><span class="cx"> 9330402C0E6A764000786E6A /* SmallStrings.cpp in Sources */,
</span><del>- 0F8F2B9E17306C8D007DBDA5 /* SourceCode.cpp in Sources */,
</del><ins>+ 0F8F2B9E17306C8D007DBDA5 /* UnlinkedSourceCode.cpp in Sources */,
</ins><span class="cx"> 0F493AFA16D0CAD30084508B /* SourceProvider.cpp in Sources */,
</span><span class="cx"> 0F338DF51BE93D550013C88F /* B3ConstrainedValue.cpp in Sources */,
</span><span class="cx"> E49DC16B12EF293E00184A1F /* SourceProviderCache.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceCodecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/parser/SourceCode.cpp (209219 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceCode.cpp 2016-12-02 00:04:13 UTC (rev 209219)
+++ trunk/Source/JavaScriptCore/parser/SourceCode.cpp 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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.
- */
-
-#include "config.h"
-#include "SourceCode.h"
-
-#include "JSCInlines.h"
-#include <wtf/text/CString.h>
-
-namespace JSC {
-
-CString SourceCode::toUTF8() const
-{
- if (!m_provider)
- return CString("", 0);
-
- return m_provider->source().substring(m_startChar, m_endChar - m_startChar).utf8();
-}
-
-} // namespace JSC
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceCodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceCode.h (209219 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceCode.h 2016-12-02 00:04:13 UTC (rev 209219)
+++ trunk/Source/JavaScriptCore/parser/SourceCode.h 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -28,31 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "SourceProvider.h"
-#include <wtf/RefPtr.h>
</del><ins>+#include "UnlinkedSourceCode.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>- class SourceCode {
</del><ins>+ class SourceCode : public UnlinkedSourceCode {
</ins><span class="cx"> public:
</span><span class="cx"> SourceCode()
</span><del>- : m_provider(0)
- , m_startChar(0)
- , m_endChar(0)
</del><ins>+ : UnlinkedSourceCode()
</ins><span class="cx"> , m_firstLine(0)
</span><span class="cx"> , m_startColumn(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SourceCode(WTF::HashTableDeletedValueType)
- : m_provider(WTF::HashTableDeletedValue)
- {
- }
-
</del><span class="cx"> SourceCode(PassRefPtr<SourceProvider> provider)
</span><del>- : m_provider(provider)
- , m_startChar(0)
- , m_endChar(m_provider->source().length())
</del><ins>+ : UnlinkedSourceCode(provider)
</ins><span class="cx"> , m_firstLine(1)
</span><span class="cx"> , m_startColumn(1)
</span><span class="cx"> {
</span><span class="lines">@@ -59,40 +49,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SourceCode(PassRefPtr<SourceProvider> provider, int firstLine, int startColumn)
</span><del>- : m_provider(provider)
- , m_startChar(0)
- , m_endChar(m_provider->source().length())
</del><ins>+ : UnlinkedSourceCode(provider)
</ins><span class="cx"> , m_firstLine(std::max(firstLine, 1))
</span><span class="cx"> , m_startColumn(std::max(startColumn, 1))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SourceCode(PassRefPtr<SourceProvider> provider, int start, int end, int firstLine, int startColumn)
- : m_provider(provider)
- , m_startChar(start)
- , m_endChar(end)
</del><ins>+ SourceCode(PassRefPtr<SourceProvider> provider, int startOffset, int endOffset, int firstLine, int startColumn)
+ : UnlinkedSourceCode(provider, startOffset, endOffset)
</ins><span class="cx"> , m_firstLine(std::max(firstLine, 1))
</span><span class="cx"> , m_startColumn(std::max(startColumn, 1))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isHashTableDeletedValue() const { return m_provider.isHashTableDeletedValue(); }
</del><ins>+ int firstLine() const { return m_firstLine; }
+ int startColumn() const { return m_startColumn; }
</ins><span class="cx">
</span><del>- unsigned hash() const
- {
- ASSERT(m_provider);
- return m_provider->hash();
- }
-
- StringView view() const
- {
- if (!m_provider)
- return StringView();
- return m_provider->getRange(m_startChar, m_endChar);
- }
-
- CString toUTF8() const;
-
</del><span class="cx"> intptr_t providerID() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_provider)
</span><span class="lines">@@ -99,21 +71,12 @@
</span><span class="cx"> return SourceProvider::nullID;
</span><span class="cx"> return m_provider->asID();
</span><span class="cx"> }
</span><del>-
- bool isNull() const { return !m_provider; }
</del><ins>+
</ins><span class="cx"> SourceProvider* provider() const { return m_provider.get(); }
</span><del>- int firstLine() const { return m_firstLine; }
- int startColumn() const { return m_startColumn; }
- int startOffset() const { return m_startChar; }
- int endOffset() const { return m_endChar; }
- int length() const { return m_endChar - m_startChar; }
-
</del><ins>+
</ins><span class="cx"> SourceCode subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RefPtr<SourceProvider> m_provider;
- int m_startChar;
- int m_endChar;
</del><span class="cx"> int m_firstLine;
</span><span class="cx"> int m_startColumn;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceCodeKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceCodeKey.h (209219 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceCodeKey.h 2016-12-02 00:04:13 UTC (rev 209219)
+++ trunk/Source/JavaScriptCore/parser/SourceCodeKey.h 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "ParserModes.h"
</span><del>-#include "SourceCode.h"
</del><ins>+#include "UnlinkedSourceCode.h"
</ins><span class="cx"> #include <wtf/HashTraits.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SourceCodeKey(
</span><del>- const SourceCode& sourceCode, const String& name, SourceCodeType codeType, JSParserStrictMode strictMode,
</del><ins>+ const UnlinkedSourceCode& sourceCode, const String& name, SourceCodeType codeType, JSParserStrictMode strictMode,
</ins><span class="cx"> JSParserScriptMode scriptMode, DerivedContextType derivedContextType, EvalContextType evalContextType, bool isArrowFunctionContext,
</span><span class="cx"> DebuggerMode debuggerMode, TypeProfilerEnabled typeProfilerEnabled, ControlFlowProfilerEnabled controlFlowProfilerEnabled)
</span><span class="cx"> : m_sourceCode(sourceCode)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SourceCode m_sourceCode;
</del><ins>+ UnlinkedSourceCode m_sourceCode;
</ins><span class="cx"> String m_name;
</span><span class="cx"> SourceCodeFlags m_flags;
</span><span class="cx"> unsigned m_hash;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserUnlinkedSourceCodecppfromrev209219trunkSourceJavaScriptCoreparserSourceCodecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/parser/UnlinkedSourceCode.cpp (from rev 209219, trunk/Source/JavaScriptCore/parser/SourceCode.cpp) (0 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/UnlinkedSourceCode.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/parser/UnlinkedSourceCode.cpp 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2016 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.
+ */
+
+#include "config.h"
+#include "UnlinkedSourceCode.h"
+
+#include "JSCInlines.h"
+#include <wtf/text/CString.h>
+
+namespace JSC {
+
+CString UnlinkedSourceCode::toUTF8() const
+{
+ if (!m_provider)
+ return CString("", 0);
+
+ return m_provider->source().substring(m_startChar, m_endChar - m_startChar).utf8();
+}
+
+} // namespace JSC
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserUnlinkedSourceCodehfromrev209192trunkSourceJavaScriptCoreparserSourceCodeh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/parser/UnlinkedSourceCode.h (from rev 209192, trunk/Source/JavaScriptCore/parser/SourceCode.h) (0 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/UnlinkedSourceCode.h (rev 0)
+++ trunk/Source/JavaScriptCore/parser/UnlinkedSourceCode.h 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -0,0 +1,99 @@
</span><ins>+/*
+ * Copyright (C) 2008, 2013, 2016 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.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
+ */
+
+#pragma once
+
+#include "SourceProvider.h"
+#include <wtf/RefPtr.h>
+
+namespace JSC {
+
+ class UnlinkedSourceCode {
+ public:
+ UnlinkedSourceCode()
+ : m_provider(0)
+ , m_startChar(0)
+ , m_endChar(0)
+ {
+ }
+
+ UnlinkedSourceCode(WTF::HashTableDeletedValueType)
+ : m_provider(WTF::HashTableDeletedValue)
+ {
+ }
+
+ UnlinkedSourceCode(PassRefPtr<SourceProvider> provider)
+ : m_provider(provider)
+ , m_startChar(0)
+ , m_endChar(m_provider->source().length())
+ {
+ }
+
+ UnlinkedSourceCode(PassRefPtr<SourceProvider> provider, int startOffset, int endOffset)
+ : m_provider(provider)
+ , m_startChar(startOffset)
+ , m_endChar(endOffset)
+ {
+ }
+
+ UnlinkedSourceCode(const UnlinkedSourceCode& other)
+ : m_provider(other.m_provider)
+ , m_startChar(other.m_startChar)
+ , m_endChar(other.m_endChar)
+ {
+ }
+
+ bool isHashTableDeletedValue() const { return m_provider.isHashTableDeletedValue(); }
+
+ unsigned hash() const
+ {
+ ASSERT(m_provider);
+ return m_provider->hash();
+ }
+
+ StringView view() const
+ {
+ if (!m_provider)
+ return StringView();
+ return m_provider->getRange(m_startChar, m_endChar);
+ }
+
+ CString toUTF8() const;
+
+ bool isNull() const { return !m_provider; }
+ int startOffset() const { return m_startChar; }
+ int endOffset() const { return m_endChar; }
+ int length() const { return m_endChar - m_startChar; }
+
+ protected:
+ RefPtr<SourceProvider> m_provider;
+ int m_startChar;
+ int m_endChar;
+ };
+
+} // namespace JSC
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.h (209219 => 209220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.h 2016-12-02 00:04:13 UTC (rev 209219)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.h 2016-12-02 00:24:17 UTC (rev 209220)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "Parser.h"
</span><span class="cx"> #include "ParserModes.h"
</span><del>-#include "SourceCode.h"
</del><span class="cx"> #include "SourceCodeKey.h"
</span><span class="cx"> #include "Strong.h"
</span><span class="cx"> #include "StrongInlines.h"
</span><span class="lines">@@ -38,6 +37,7 @@
</span><span class="cx"> #include "UnlinkedEvalCodeBlock.h"
</span><span class="cx"> #include "UnlinkedModuleProgramCodeBlock.h"
</span><span class="cx"> #include "UnlinkedProgramCodeBlock.h"
</span><ins>+#include "UnlinkedSourceCode.h"
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre>
</div>
</div>
</body>
</html>