<!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>[37175] trunk/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/37175">37175</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2008-10-01 18:30:13 -0700 (Wed, 01 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-09-30  Darin Adler  &lt;darin@apple.com&gt;

        Reviewed by Eric Seidel.

        - https://bugs.webkit.org/show_bug.cgi?id=21214
          work on getting rid of ExecState

        Eliminate some unneeded uses of dynamicGlobalObject.

        * API/JSClassRef.cpp:
        (OpaqueJSClass::contextData): Changed to use a map in the global data instead
        of on the global object. Also fixed to use only a single hash table lookup.

        * API/JSObjectRef.cpp:
        (JSObjectMakeConstructor): Use lexicalGlobalObject rather than dynamicGlobalObject
        to get the object prototype.

        * kjs/ArrayPrototype.cpp:
        (JSC::arrayProtoFuncToString): Use arrayVisitedElements set in global data rather
        than in the global object.
        (JSC::arrayProtoFuncToLocaleString): Ditto.
        (JSC::arrayProtoFuncJoin): Ditto.

        * kjs/JSGlobalData.cpp:
        (JSC::JSGlobalData::JSGlobalData): Don't initialize opaqueJSClassData, since
        it's no longer a pointer.
        (JSC::JSGlobalData::~JSGlobalData): We still need to delete all the values, but
        we don't need to delete the map since it's no longer a pointer.

        * kjs/JSGlobalData.h: Made opaqueJSClassData a map instead of a pointer to a map.
        Also added arrayVisitedElements.

        * kjs/JSGlobalObject.h: Removed arrayVisitedElements.

        * kjs/Shell.cpp:
        (functionRun): Use lexicalGlobalObject instead of dynamicGlobalObject.
        (functionLoad): Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreAPIJSClassRefcpp">trunk/JavaScriptCore/API/JSClassRef.cpp</a></li>
<li><a href="#trunkJavaScriptCoreAPIJSObjectRefcpp">trunk/JavaScriptCore/API/JSObjectRef.cpp</a></li>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorekjsArrayPrototypecpp">trunk/JavaScriptCore/kjs/ArrayPrototype.cpp</a></li>
<li><a href="#trunkJavaScriptCorekjsJSGlobalDatacpp">trunk/JavaScriptCore/kjs/JSGlobalData.cpp</a></li>
<li><a href="#trunkJavaScriptCorekjsJSGlobalDatah">trunk/JavaScriptCore/kjs/JSGlobalData.h</a></li>
<li><a href="#trunkJavaScriptCorekjsJSGlobalObjecth">trunk/JavaScriptCore/kjs/JSGlobalObject.h</a></li>
<li><a href="#trunkJavaScriptCorekjsShellcpp">trunk/JavaScriptCore/kjs/Shell.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreAPIJSClassRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/API/JSClassRef.cpp (37174 => 37175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/API/JSClassRef.cpp        2008-10-02 01:05:15 UTC (rev 37174)
+++ trunk/JavaScriptCore/API/JSClassRef.cpp        2008-10-02 01:30:13 UTC (rev 37175)
</span><span class="lines">@@ -185,11 +185,10 @@
</span><span class="cx"> 
</span><span class="cx"> OpaqueJSClassContextData&amp; OpaqueJSClass::contextData(ExecState* exec)
</span><span class="cx"> {
</span><del>-    HashMap&lt;OpaqueJSClass*, OpaqueJSClassContextData*&gt;* contextDataMap = exec-&gt;globalData().opaqueJSClassData;
-    HashMap&lt;OpaqueJSClass*, OpaqueJSClassContextData*&gt;::iterator iter = contextDataMap-&gt;find(this);
-    if (iter != contextDataMap-&gt;end())
-        return *iter-&gt;second;
-    return *contextDataMap-&gt;add(this, new OpaqueJSClassContextData(this)).first-&gt;second;
</del><ins>+    OpaqueJSClassContextData*&amp; contextData = exec-&gt;globalData().opaqueJSClassData.add(this, 0).first-&gt;second;
+    if (!contextData)
+        contextData = new OpaqueJSClassContextData(this);
+    return *contextData;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> UString OpaqueJSClass::className()
</span></span></pre></div>
<a id="trunkJavaScriptCoreAPIJSObjectRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/API/JSObjectRef.cpp (37174 => 37175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/API/JSObjectRef.cpp        2008-10-02 01:05:15 UTC (rev 37174)
+++ trunk/JavaScriptCore/API/JSObjectRef.cpp        2008-10-02 01:30:13 UTC (rev 37175)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> 
</span><span class="cx">     JSValue* jsPrototype = jsClass 
</span><span class="cx">         ? jsClass-&gt;prototype(exec)
</span><del>-        : exec-&gt;dynamicGlobalObject()-&gt;objectPrototype();
</del><ins>+        : exec-&gt;lexicalGlobalObject()-&gt;objectPrototype();
</ins><span class="cx">     
</span><span class="cx">     JSCallbackConstructor* constructor = new (exec) JSCallbackConstructor(exec-&gt;lexicalGlobalObject()-&gt;callbackConstructorStructure(), jsClass, callAsConstructor);
</span><span class="cx">     constructor-&gt;putDirect(exec-&gt;propertyNames().prototype, jsPrototype, DontEnum | DontDelete | ReadOnly);
</span></span></pre></div>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (37174 => 37175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2008-10-02 01:05:15 UTC (rev 37174)
+++ trunk/JavaScriptCore/ChangeLog        2008-10-02 01:30:13 UTC (rev 37175)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2008-09-30  Darin Adler  &lt;darin@apple.com&gt;
+
+        Reviewed by Eric Seidel.
+
+        - https://bugs.webkit.org/show_bug.cgi?id=21214
+          work on getting rid of ExecState
+
+        Eliminate some unneeded uses of dynamicGlobalObject.
+
+        * API/JSClassRef.cpp:
+        (OpaqueJSClass::contextData): Changed to use a map in the global data instead
+        of on the global object. Also fixed to use only a single hash table lookup.
+
+        * API/JSObjectRef.cpp:
+        (JSObjectMakeConstructor): Use lexicalGlobalObject rather than dynamicGlobalObject
+        to get the object prototype.
+
+        * kjs/ArrayPrototype.cpp:
+        (JSC::arrayProtoFuncToString): Use arrayVisitedElements set in global data rather
+        than in the global object.
+        (JSC::arrayProtoFuncToLocaleString): Ditto.
+        (JSC::arrayProtoFuncJoin): Ditto.
+
+        * kjs/JSGlobalData.cpp:
+        (JSC::JSGlobalData::JSGlobalData): Don't initialize opaqueJSClassData, since
+        it's no longer a pointer.
+        (JSC::JSGlobalData::~JSGlobalData): We still need to delete all the values, but
+        we don't need to delete the map since it's no longer a pointer.
+
+        * kjs/JSGlobalData.h: Made opaqueJSClassData a map instead of a pointer to a map.
+        Also added arrayVisitedElements.
+
+        * kjs/JSGlobalObject.h: Removed arrayVisitedElements.
+
+        * kjs/Shell.cpp:
+        (functionRun): Use lexicalGlobalObject instead of dynamicGlobalObject.
+        (functionLoad): Ditto.
+
</ins><span class="cx"> 2008-10-01  Cameron Zwarich  &lt;zwarich@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Not reviewed.
</span><span class="lines">@@ -70,7 +108,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2008-10-01  Kevin McCullough  &lt;kmccullough@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Rubberstamped by Geoff .
</del><ins>+        Rubberstamped by Geoff Garen.
</ins><span class="cx"> 
</span><span class="cx">         Remove BreakpointCheckStatement because it's not used anymore.
</span><span class="cx">         No effect on sunspider or the jsc tests.
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/ArrayPrototype.cpp (37174 => 37175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/ArrayPrototype.cpp        2008-10-02 01:05:15 UTC (rev 37174)
+++ trunk/JavaScriptCore/kjs/ArrayPrototype.cpp        2008-10-02 01:30:13 UTC (rev 37175)
</span><span class="lines">@@ -125,15 +125,15 @@
</span><span class="cx">         return throwError(exec, TypeError);
</span><span class="cx">     JSObject* thisObj = static_cast&lt;JSArray*&gt;(thisValue);
</span><span class="cx"> 
</span><del>-    HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;dynamicGlobalObject()-&gt;arrayVisitedElements();
</del><ins>+    HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;globalData().arrayVisitedElements;
</ins><span class="cx">     if (arrayVisitedElements.size() &gt; MaxReentryDepth)
</span><span class="cx">         return throwError(exec, RangeError, &quot;Maximum call stack size exceeded.&quot;);
</span><span class="cx"> 
</span><span class="cx">     bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
</span><del>-    Vector&lt;UChar, 256&gt; strBuffer;
</del><span class="cx">     if (alreadyVisited)
</span><span class="cx">         return jsEmptyString(exec); // return an empty string, avoiding infinite recursion.
</span><span class="cx"> 
</span><ins>+    Vector&lt;UChar, 256&gt; strBuffer;
</ins><span class="cx">     unsigned length = thisObj-&gt;get(exec, exec-&gt;propertyNames().length)-&gt;toUInt32(exec);
</span><span class="cx">     for (unsigned k = 0; k &lt; length; k++) {
</span><span class="cx">         if (k &gt;= 1)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">         if (exec-&gt;hadException())
</span><span class="cx">             break;
</span><span class="cx">     }
</span><del>-    exec-&gt;dynamicGlobalObject()-&gt;arrayVisitedElements().remove(thisObj);
</del><ins>+    arrayVisitedElements.remove(thisObj);
</ins><span class="cx">     return jsString(exec, UString(strBuffer.data(), strBuffer.data() ? strBuffer.size() : 0));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -169,15 +169,15 @@
</span><span class="cx">         return throwError(exec, TypeError);
</span><span class="cx">     JSObject* thisObj = static_cast&lt;JSArray*&gt;(thisValue);
</span><span class="cx"> 
</span><del>-    HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;dynamicGlobalObject()-&gt;arrayVisitedElements();
</del><ins>+    HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;globalData().arrayVisitedElements;
</ins><span class="cx">     if (arrayVisitedElements.size() &gt; MaxReentryDepth)
</span><span class="cx">         return throwError(exec, RangeError, &quot;Maximum call stack size exceeded.&quot;);
</span><span class="cx"> 
</span><span class="cx">     bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
</span><del>-    Vector&lt;UChar, 256&gt; strBuffer;
</del><span class="cx">     if (alreadyVisited)
</span><span class="cx">         return jsEmptyString(exec); // return an empty string, avoding infinite recursion.
</span><span class="cx"> 
</span><ins>+    Vector&lt;UChar, 256&gt; strBuffer;
</ins><span class="cx">     unsigned length = thisObj-&gt;get(exec, exec-&gt;propertyNames().length)-&gt;toUInt32(exec);
</span><span class="cx">     for (unsigned k = 0; k &lt; length; k++) {
</span><span class="cx">         if (k &gt;= 1)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">         if (exec-&gt;hadException())
</span><span class="cx">             break;
</span><span class="cx">     }
</span><del>-    exec-&gt;dynamicGlobalObject()-&gt;arrayVisitedElements().remove(thisObj);
</del><ins>+    arrayVisitedElements.remove(thisObj);
</ins><span class="cx">     return jsString(exec, UString(strBuffer.data(), strBuffer.data() ? strBuffer.size() : 0));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -219,15 +219,16 @@
</span><span class="cx"> {
</span><span class="cx">     JSObject* thisObj = thisValue-&gt;toThisObject(exec);
</span><span class="cx"> 
</span><del>-    HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;dynamicGlobalObject()-&gt;arrayVisitedElements();
</del><ins>+    HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;globalData().arrayVisitedElements;
</ins><span class="cx">     if (arrayVisitedElements.size() &gt; MaxReentryDepth)
</span><span class="cx">         return throwError(exec, RangeError, &quot;Maximum call stack size exceeded.&quot;);
</span><span class="cx"> 
</span><span class="cx">     bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
</span><del>-    Vector&lt;UChar, 256&gt; strBuffer;
</del><span class="cx">     if (alreadyVisited)
</span><span class="cx">         return jsEmptyString(exec); // return an empty string, avoding infinite recursion.
</span><span class="cx"> 
</span><ins>+    Vector&lt;UChar, 256&gt; strBuffer;
+
</ins><span class="cx">     UChar comma = ',';
</span><span class="cx">     UString separator = args.at(exec, 0)-&gt;isUndefined() ? UString(&amp;comma, 1) : args.at(exec, 0)-&gt;toString(exec);
</span><span class="cx"> 
</span><span class="lines">@@ -256,7 +257,7 @@
</span><span class="cx">         if (exec-&gt;hadException())
</span><span class="cx">             break;
</span><span class="cx">     }
</span><del>-    exec-&gt;dynamicGlobalObject()-&gt;arrayVisitedElements().remove(thisObj);
</del><ins>+    arrayVisitedElements.remove(thisObj);
</ins><span class="cx">     return jsString(exec, UString(strBuffer.data(), strBuffer.data() ? strBuffer.size() : 0));
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsJSGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/JSGlobalData.cpp (37174 => 37175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/JSGlobalData.cpp        2008-10-02 01:05:15 UTC (rev 37174)
+++ trunk/JavaScriptCore/kjs/JSGlobalData.cpp        2008-10-02 01:30:13 UTC (rev 37175)
</span><span class="lines">@@ -82,7 +82,6 @@
</span><span class="cx">     , identifierTable(createIdentifierTable())
</span><span class="cx">     , propertyNames(new CommonIdentifiers(this))
</span><span class="cx">     , emptyList(new ArgList)
</span><del>-    , opaqueJSClassData(new HashMap&lt;OpaqueJSClass*, OpaqueJSClassContextData*&gt;)
</del><span class="cx">     , newParserObjects(0)
</span><span class="cx">     , parserObjectExtraRefCounts(0)
</span><span class="cx">     , lexer(new Lexer(this))
</span><span class="lines">@@ -122,8 +121,7 @@
</span><span class="cx">     delete parser;
</span><span class="cx">     delete lexer;
</span><span class="cx"> 
</span><del>-    deleteAllValues(*opaqueJSClassData);
-    delete opaqueJSClassData;
</del><ins>+    deleteAllValues(opaqueJSClassData);
</ins><span class="cx"> 
</span><span class="cx">     delete emptyList;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsJSGlobalDatah"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/JSGlobalData.h (37174 => 37175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/JSGlobalData.h        2008-10-02 01:05:15 UTC (rev 37174)
+++ trunk/JavaScriptCore/kjs/JSGlobalData.h        2008-10-02 01:30:13 UTC (rev 37175)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx">     class Heap;
</span><span class="cx">     class IdentifierTable;
</span><span class="cx">     class JSGlobalObject;
</span><ins>+    class JSObject;
</ins><span class="cx">     class Lexer;
</span><span class="cx">     class Machine;
</span><span class="cx">     class Parser;
</span><span class="lines">@@ -83,7 +84,7 @@
</span><span class="cx"> 
</span><span class="cx">         SmallStrings smallStrings;
</span><span class="cx">         
</span><del>-        HashMap&lt;OpaqueJSClass*, OpaqueJSClassContextData*&gt;* opaqueJSClassData;
</del><ins>+        HashMap&lt;OpaqueJSClass*, OpaqueJSClassContextData*&gt; opaqueJSClassData;
</ins><span class="cx"> 
</span><span class="cx">         HashSet&lt;ParserRefCounted*&gt;* newParserObjects;
</span><span class="cx">         HashCountedSet&lt;ParserRefCounted*&gt;* parserObjectExtraRefCounts;
</span><span class="lines">@@ -95,6 +96,8 @@
</span><span class="cx"> 
</span><span class="cx">         bool isSharedInstance;
</span><span class="cx"> 
</span><ins>+        HashSet&lt;JSObject*&gt; arrayVisitedElements;
+
</ins><span class="cx">     private:
</span><span class="cx">         JSGlobalData(bool isShared = false);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/JSGlobalObject.h (37174 => 37175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/JSGlobalObject.h        2008-10-02 01:05:15 UTC (rev 37174)
+++ trunk/JavaScriptCore/kjs/JSGlobalObject.h        2008-10-02 01:30:13 UTC (rev 37175)
</span><span class="lines">@@ -138,8 +138,6 @@
</span><span class="cx">             RefPtr&lt;JSGlobalData&gt; globalData;
</span><span class="cx"> 
</span><span class="cx">             HashSet&lt;ProgramCodeBlock*&gt; codeBlocks;
</span><del>-
-            OwnPtr&lt;HashSet&lt;JSObject*&gt; &gt; arrayVisitedElements; // Global data shared by array prototype functions.
</del><span class="cx">         };
</span><span class="cx"> 
</span><span class="cx">     public:
</span><span class="lines">@@ -242,8 +240,6 @@
</span><span class="cx"> 
</span><span class="cx">         virtual bool isDynamicScope() const;
</span><span class="cx"> 
</span><del>-        HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements() { if (!d()-&gt;arrayVisitedElements) d()-&gt;arrayVisitedElements.set(new HashSet&lt;JSObject*&gt;); return *d()-&gt;arrayVisitedElements; }
-
</del><span class="cx">         HashSet&lt;ProgramCodeBlock*&gt;&amp; codeBlocks() { return d()-&gt;codeBlocks; }
</span><span class="cx"> 
</span><span class="cx">         void copyGlobalsFrom(RegisterFile&amp;);
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsShellcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/Shell.cpp (37174 => 37175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/Shell.cpp        2008-10-02 01:05:15 UTC (rev 37174)
+++ trunk/JavaScriptCore/kjs/Shell.cpp        2008-10-02 01:30:13 UTC (rev 37175)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">     if (!fillBufferWithContentsOfFile(fileName, script))
</span><span class="cx">         return throwError(exec, GeneralError, &quot;Could not open file.&quot;);
</span><span class="cx"> 
</span><del>-    JSGlobalObject* globalObject = exec-&gt;dynamicGlobalObject();
</del><ins>+    JSGlobalObject* globalObject = exec-&gt;lexicalGlobalObject();
</ins><span class="cx"> 
</span><span class="cx">     stopWatch.start();
</span><span class="cx">     Interpreter::evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), fileName, 1, script.data());
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">     if (!fillBufferWithContentsOfFile(fileName, script))
</span><span class="cx">         return throwError(exec, GeneralError, &quot;Could not open file.&quot;);
</span><span class="cx"> 
</span><del>-    JSGlobalObject* globalObject = exec-&gt;dynamicGlobalObject();
</del><ins>+    JSGlobalObject* globalObject = exec-&gt;lexicalGlobalObject();
</ins><span class="cx">     Interpreter::evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), fileName, 1, script.data());
</span><span class="cx"> 
</span><span class="cx">     return jsUndefined();
</span></span></pre>
</div>
</div>

</body>
</html>