Changeset 106414 in webkit

Timestamp:

Jan 31, 2012 5:18:38 PM (12 years ago)

Author:

oliver@apple.com

Message:

Remove unneeded sourceId property
​https://bugs.webkit.org/show_bug.cgi?id=77495

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

sourceId isn't used anymore, so we'll just remove it.

• runtime/Error.cpp:

(JSC):
(JSC::addErrorInfo):
(JSC::hasErrorInfo):

LayoutTests:

Update the test for the removal of sourceId

• fast/js/exception-properties-expected.txt:
• fast/js/script-tests/exception-properties.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/exception-properties-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/script-tests/exception-properties.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/Error.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-31  Oliver Hunt  <oliver@apple.com>
+
+        Remove unneeded sourceId property
+        https://bugs.webkit.org/show_bug.cgi?id=77495
+
+        Reviewed by Filip Pizlo.
+
+        Update the test for the removal of sourceId
+
+        * fast/js/exception-properties-expected.txt:
+        * fast/js/script-tests/exception-properties.js:
+
 2012-01-31  Yuzo Fujishima  <yuzo@google.com>
 

trunk/LayoutTests/fast/js/exception-properties-expected.txt

@@ -5 +5 @@
 
 PASS enumerableProperties(error) is []
-PASS enumerableProperties(nativeError) is ["line", "sourceId", "sourceURL", "stack"]
+PASS enumerableProperties(nativeError) is ["line", "sourceURL", "stack"]
 PASS Object.getPrototypeOf(nativeError).name is "RangeError"
 PASS Object.getPrototypeOf(nativeError).message is ""

trunk/LayoutTests/fast/js/script-tests/exception-properties.js

@@ -17 +17 @@
 
     shouldBe('enumerableProperties(error)', '[]');
-    shouldBe('enumerableProperties(nativeError)', '["line", "sourceId", "sourceURL", "stack"]');
+    shouldBe('enumerableProperties(nativeError)', '["line", "sourceURL", "stack"]');
 
     shouldBe('Object.getPrototypeOf(nativeError).name', '"RangeError"');

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-01-31  Oliver Hunt  <oliver@apple.com>
+
+        Remove unneeded sourceId property
+        https://bugs.webkit.org/show_bug.cgi?id=77495
+
+        Reviewed by Filip Pizlo.
+
+        sourceId isn't used anymore, so we'll just remove it.
+
+        * runtime/Error.cpp:
+        (JSC):
+        (JSC::addErrorInfo):
+        (JSC::hasErrorInfo):
+
 2012-01-31  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Error.cpp

@@ -40 +40 @@
 
 static const char* linePropertyName = "line";
-static const char* sourceIdPropertyName = "sourceId";
 static const char* sourceURLPropertyName = "sourceURL";
 
@@ -122 +121 @@
 JSObject* addErrorInfo(JSGlobalData* globalData, JSObject* error, int line, const SourceCode& source, const Vector<StackFrame>& stackTrace)
 {
-    intptr_t sourceID = source.provider()->asID();
     const UString& sourceURL = source.provider()->url();
 
     if (line != -1)
         error->putDirect(*globalData, Identifier(globalData, linePropertyName), jsNumber(line), ReadOnly | DontDelete);
-    if (sourceID != -1)
-        error->putDirect(*globalData, Identifier(globalData, sourceIdPropertyName), jsNumber((double)sourceID), ReadOnly | DontDelete);
     if (!sourceURL.isNull())
         error->putDirect(*globalData, Identifier(globalData, sourceURLPropertyName), jsString(globalData, sourceURL), ReadOnly | DontDelete);
@@ -164 +160 @@
 {
     return error->hasProperty(exec, Identifier(exec, linePropertyName))
-        || error->hasProperty(exec, Identifier(exec, sourceIdPropertyName))
         || error->hasProperty(exec, Identifier(exec, sourceURLPropertyName));
 }