Title: [171524] branches/safari-600.1-branch/Source/_javascript_Core
- Revision
- 171524
- Author
- lforsch...@apple.com
- Date
- 2014-07-24 14:00:54 -0700 (Thu, 24 Jul 2014)
Log Message
Merged r171395. <rdar://problem/17544620>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog (171523 => 171524)
--- branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-24 20:58:05 UTC (rev 171523)
+++ branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-24 21:00:54 UTC (rev 171524)
@@ -1,5 +1,17 @@
2014-07-24 Lucas Forschler <lforsch...@apple.com>
+ Merge r171395
+
+ 2014-07-22 Brent Fulgham <bfulg...@apple.com>
+
+ Build fix for non-clang compile.
+
+ * jsc.cpp:
+ (WTF::RuntimeArray::put): Remove incorrect return statement
+ I added.
+
+2014-07-24 Lucas Forschler <lforsch...@apple.com>
+
Merge r171393
2014-07-22 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-600.1-branch/Source/_javascript_Core/jsc.cpp (171523 => 171524)
--- branches/safari-600.1-branch/Source/_javascript_Core/jsc.cpp 2014-07-24 20:58:05 UTC (rev 171523)
+++ branches/safari-600.1-branch/Source/_javascript_Core/jsc.cpp 2014-07-24 21:00:54 UTC (rev 171524)
@@ -335,9 +335,6 @@
static NO_RETURN_DUE_TO_CRASH void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&)
{
RELEASE_ASSERT_NOT_REACHED();
-#if !COMPILER(CLANG)
- return true;
-#endif
}
static NO_RETURN_DUE_TO_CRASH bool deleteProperty(JSCell*, ExecState*, PropertyName)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
