Title: [94997] trunk/Source/_javascript_Core
Revision
94997
Author
jam...@google.com
Date
2011-09-12 18:57:00 -0700 (Mon, 12 Sep 2011)

Log Message

Unreviewed build fix for chromium.

Guard access to UString::latin1() with USE(JSC) since it is defined in _javascript_Core/runtime/UString.cpp, which
is currently only compiled in by ports that use _javascript_Core.  This code is currently unreachable in builds so
no change in functionality.

* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::CharAccess::CharAccess):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (94996 => 94997)


--- trunk/Source/_javascript_Core/ChangeLog	2011-09-13 01:33:43 UTC (rev 94996)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-13 01:57:00 UTC (rev 94997)
@@ -1,3 +1,14 @@
+2011-09-12  James Robinson  <jam...@chromium.org>
+
+        Unreviewed build fix for chromium.
+
+        Guard access to UString::latin1() with USE(JSC) since it is defined in _javascript_Core/runtime/UString.cpp, which
+        is currently only compiled in by ports that use _javascript_Core.  This code is currently unreachable in builds so
+        no change in functionality.
+
+        * yarr/YarrInterpreter.cpp:
+        (JSC::Yarr::Interpreter::CharAccess::CharAccess):
+
 2011-09-09  Filip Pizlo  <fpi...@apple.com>
 
         _javascript_Core does not have speculative->baseline OSR

Modified: trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp (94996 => 94997)


--- trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp	2011-09-13 01:33:43 UTC (rev 94996)
+++ trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp	2011-09-13 01:57:00 UTC (rev 94997)
@@ -176,10 +176,14 @@
             : m_buffer(0)
         {
             if (s.is8Bit()) {
+#if USE(JSC)
                 m_charSize = Char8;
                 unsigned length = s.length();
                 m_ptr.ptr8 = m_buffer = static_cast<char *>(fastMalloc(length));
                 memcpy(m_buffer, s.latin1().data(), length);
+#else
+                ASSERT_NOT_REACHED();
+#endif
             } else {
                 m_charSize = Char16;
                 m_ptr.ptr16 = s.characters();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to