Changeset 118966 in webkit for trunk/Source/JavaScriptCore/parser/SourceProvider.h

Timestamp:

May 30, 2012, 2:04:23 PM (13 years ago)

Author:

[email protected]

Message:

ScriptDebugServer wants sourceIDs that are non-zero because that's what HashMaps want, so JSC should placate it
​https://bugs.webkit.org/show_bug.cgi?id=87887

Reviewed by Darin Adler.

Better fix - we now never call SourceProvider::asID() if SourceProvider* is 0.

• parser/Nodes.h:

(JSC::ScopeNode::sourceID):

• parser/SourceCode.h:

(JSC::SourceCode::providerID):
(SourceCode):

• parser/SourceProvider.h:

(SourceProvider):
(JSC::SourceProvider::asID):

• runtime/Executable.h:

(JSC::ScriptExecutable::sourceID):

File:

• trunk/Source/JavaScriptCore/parser/SourceProvider.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/parser/SourceProvider.h

@@ -41 +41 @@
     class SourceProvider : public RefCounted<SourceProvider> {
     public:
+        static const intptr_t nullID = 1;
+        
         SourceProvider(const UString& url, const TextPosition& startPosition, SourceProviderCache* cache = 0)
             : m_url(url)
@@ -64 +66 @@
         intptr_t asID()
         {
-            if (!this)
-                return 1;
+            ASSERT(this);
+            if (!this) // Be defensive in release mode.
+                return nullID;
             return reinterpret_cast<intptr_t>(this);
         }