Title: [153322] trunk/Source/_javascript_Core
- Revision
- 153322
- Author
- allan.jen...@digia.com
- Date
- 2013-07-25 06:11:16 -0700 (Thu, 25 Jul 2013)
Log Message
[Qt] Build fix after FTL.
Un Reviewed build fix.
* Target.pri:
* interpreter/StackIterator.cpp:
(JSC::StackIterator::Frame::print):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (153321 => 153322)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-25 13:07:55 UTC (rev 153321)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-25 13:11:16 UTC (rev 153322)
@@ -1,3 +1,13 @@
+2013-07-25 Allan Sandfeld Jensen <allan.jen...@digia.com>
+
+ [Qt] Build fix after FTL.
+
+ Un Reviewed build fix.
+
+ * Target.pri:
+ * interpreter/StackIterator.cpp:
+ (JSC::StackIterator::Frame::print):
+
2013-07-25 Gabor Rapcsanyi <rga...@webkit.org>
Unreviewed build fix after FTL upstream.
Modified: trunk/Source/_javascript_Core/Target.pri (153321 => 153322)
--- trunk/Source/_javascript_Core/Target.pri 2013-07-25 13:07:55 UTC (rev 153321)
+++ trunk/Source/_javascript_Core/Target.pri 2013-07-25 13:11:16 UTC (rev 153322)
@@ -367,6 +367,7 @@
linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
SOURCES += \
+ disassembler/X86Disassembler.cpp \
disassembler/UDis86Disassembler.cpp \
disassembler/udis86/udis86.c \
disassembler/udis86/udis86_decode.c \
Modified: trunk/Source/_javascript_Core/interpreter/StackIterator.cpp (153321 => 153322)
--- trunk/Source/_javascript_Core/interpreter/StackIterator.cpp 2013-07-25 13:07:55 UTC (rev 153321)
+++ trunk/Source/_javascript_Core/interpreter/StackIterator.cpp 2013-07-25 13:11:16 UTC (rev 153322)
@@ -341,7 +341,7 @@
printif(i, "frame %p {\n", this);
CallFrame* callerFrame = this->callerFrame();
- void* returnPC = hasReturnPC()? this->returnPC().value() : nullptr;
+ void* returnPC = hasReturnPC() ? this->returnPC().value() : 0;
printif(i, " name '%s'\n", functionName().utf8().data());
printif(i, " sourceURL '%s'\n", sourceURL().utf8().data());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
