Title: [118960] trunk/Source/_javascript_Core
- Revision
- 118960
- Author
- [email protected]
- Date
- 2012-05-30 13:18:00 -0700 (Wed, 30 May 2012)
Log 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 Geoffrey Garen.
* parser/SourceProvider.h:
(JSC::SourceProvider::asID):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (118959 => 118960)
--- trunk/Source/_javascript_Core/ChangeLog 2012-05-30 20:17:11 UTC (rev 118959)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-05-30 20:18:00 UTC (rev 118960)
@@ -1,3 +1,13 @@
+2012-05-30 Filip Pizlo <[email protected]>
+
+ 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 Geoffrey Garen.
+
+ * parser/SourceProvider.h:
+ (JSC::SourceProvider::asID):
+
2012-05-30 Oliver Hunt <[email protected]>
DFG does not correctly handle exceptions caught in the LLInt
Modified: trunk/Source/_javascript_Core/parser/SourceProvider.h (118959 => 118960)
--- trunk/Source/_javascript_Core/parser/SourceProvider.h 2012-05-30 20:17:11 UTC (rev 118959)
+++ trunk/Source/_javascript_Core/parser/SourceProvider.h 2012-05-30 20:18:00 UTC (rev 118960)
@@ -61,7 +61,12 @@
const UString& url() { return m_url; }
TextPosition startPosition() const { return m_startPosition; }
- intptr_t asID() { return reinterpret_cast<intptr_t>(this); }
+ intptr_t asID()
+ {
+ if (!this)
+ return 1;
+ return reinterpret_cast<intptr_t>(this);
+ }
bool isValid() const { return m_validated; }
void setValid() { m_validated = true; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
