Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (127940 => 127941)
--- trunk/Source/_javascript_Core/ChangeLog 2012-09-08 00:25:24 UTC (rev 127940)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-09-08 00:32:15 UTC (rev 127941)
@@ -1,3 +1,16 @@
+2012-09-07 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r127938.
+ http://trac.webkit.org/changeset/127938
+ https://bugs.webkit.org/show_bug.cgi?id=96166
+
+ It broke the build (Requested by smfr on #webkit).
+
+ * llint/LowLevelInterpreter.cpp:
+ (JSC):
+ (JSC::CLoop::execute):
+ * offlineasm/cloop.rb:
+
2012-09-07 Geoffrey Garen <gga...@apple.com>
Refactored bytecode generator initialization to support moving captured vars around
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp (127940 => 127941)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp 2012-09-08 00:25:24 UTC (rev 127940)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp 2012-09-08 00:32:15 UTC (rev 127941)
@@ -36,7 +36,6 @@
#include "LLintCLoop.h"
#include "LLintSlowPaths.h"
#include "VMInspector.h"
-#include <wtf/Assertions.h>
#include <wtf/MathExtras.h>
using namespace JSC::LLInt;
@@ -99,10 +98,6 @@
#define OFFLINE_ASM_LOCAL_LABEL(label) label:
-//============================================================================
-// Some utilities:
-//
-
namespace JSC {
namespace LLInt {
@@ -121,15 +116,11 @@
} // namespace LLint
-//============================================================================
-// The llint C++ interpreter loop:
-//
-
JSValue CLoop::execute(CallFrame* callFrame, OpcodeID bootstrapOpcodeId,
bool isInitializationPass)
{
#define CAST reinterpret_cast
- #define SIGN_BIT32(x) ((x) & 0x80000000)
+ #define SIGN_BIT32(x) (x & 0x80000000)
// One-time initialization of our address tables. We have to put this code
// here because our labels are only in scope inside this function. The
Modified: trunk/Source/_javascript_Core/offlineasm/cloop.rb (127940 => 127941)
--- trunk/Source/_javascript_Core/offlineasm/cloop.rb 2012-09-08 00:25:24 UTC (rev 127940)
+++ trunk/Source/_javascript_Core/offlineasm/cloop.rb 2012-09-08 00:32:15 UTC (rev 127941)
@@ -172,7 +172,7 @@
def pointerExpr
if base.is_a? RegisterID and base.name == "sp"
offsetValue = "#{offset.value}"
- "(ASSERT(#{offsetValue} == offsetof(JITStackFrame, globalData)), &sp->globalData)"
+ "(assert(#{offsetValue} == offsetof(JITStackFrame, globalData)), &sp->globalData)"
elsif offset.value == 0
"#{base.clValue(:int8Ptr)}"
elsif offset.value > 0
@@ -236,7 +236,7 @@
def pointerExpr
if base.is_a? RegisterID and base.name == "sp"
offsetValue = "(#{index.clValue(:int32)} << #{scaleShift}) + #{offset.clValue})"
- "(ASSERT(#{offsetValue} == offsetof(JITStackFrame, globalData)), &sp->globalData)"
+ "(assert(#{offsetValue} == offsetof(JITStackFrame, globalData)), &sp->globalData)"
else
"#{base.clValue(:int8Ptr)} + (#{index.clValue(:int32)} << #{scaleShift}) + #{offset.clValue}"
end
Modified: trunk/Source/WTF/ChangeLog (127940 => 127941)
--- trunk/Source/WTF/ChangeLog 2012-09-08 00:25:24 UTC (rev 127940)
+++ trunk/Source/WTF/ChangeLog 2012-09-08 00:32:15 UTC (rev 127941)
@@ -1,3 +1,13 @@
+2012-09-07 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r127938.
+ http://trac.webkit.org/changeset/127938
+ https://bugs.webkit.org/show_bug.cgi?id=96166
+
+ It broke the build (Requested by smfr on #webkit).
+
+ * wtf/Assertions.h:
+
2012-09-07 Mark Lam <mark....@apple.com>
Fixed ASSERT() and ASSERT_AT() macros so that they can be used in
Modified: trunk/Source/WTF/wtf/Assertions.h (127940 => 127941)
--- trunk/Source/WTF/wtf/Assertions.h 2012-09-08 00:25:24 UTC (rev 127940)
+++ trunk/Source/WTF/wtf/Assertions.h 2012-09-08 00:32:15 UTC (rev 127941)
@@ -244,21 +244,20 @@
#else
-static inline void wtfAssert(bool assertion, const char* file, int line,
- const char* function, const char* assertionString)
-{
- if (!assertion) {
- WTFReportAssertionFailure(file, line, function, assertionString);
- CRASH();
- }
-}
+#define ASSERT(assertion) do \
+ if (!(assertion)) { \
+ WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion); \
+ CRASH(); \
+ } \
+while (0)
-#define ASSERT(assertion) \
- wtfAssert(!!(assertion), __FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion)
+#define ASSERT_AT(assertion, file, line, function) do \
+ if (!(assertion)) { \
+ WTFReportAssertionFailure(file, line, function, #assertion); \
+ CRASH(); \
+ } \
+while (0)
-#define ASSERT_AT(assertion, file, line, function) \
- wtfAssert(!!(assertion), file, line, function, #assertion)
-
#define ASSERT_NOT_REACHED() do { \
WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, 0); \
CRASH(); \
