another snap on JavaScriptCore asserts, follow up on 4cceec22

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86_64.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86_64.h
index 957c964..ec93f8c 100644 (file)
--- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86_64.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86_64.h
@@ -110,9 +110,7 @@ public:
 
     Call call()
     {
-#if !ASSERT_DISABLED
         DataLabelPtr label = moveWithPatch(ImmPtr(0), scratchRegister);
-#endif
         Call result = Call(m_assembler.call(scratchRegister), Call::Linkable);
         ASSERT(differenceBetween(label, result) == REPTACH_OFFSET_CALL_R11);
         return result;
@@ -120,9 +118,7 @@ public:
 
     Call tailRecursiveCall()
     {
-#if !ASSERT_DISABLED
         DataLabelPtr label = moveWithPatch(ImmPtr(0), scratchRegister);
-#endif
         Jump newJump = Jump(m_assembler.jmp_r(scratchRegister));
         ASSERT(differenceBetween(label, newJump) == REPTACH_OFFSET_CALL_R11);
         return Call::fromTailJump(newJump);
@@ -131,9 +127,7 @@ public:
     Call makeTailRecursiveCall(Jump oldJump)
     {
         oldJump.link(this);
-#if !ASSERT_DISABLED
         DataLabelPtr label = moveWithPatch(ImmPtr(0), scratchRegister);
-#endif
         Jump newJump = Jump(m_assembler.jmp_r(scratchRegister));
         ASSERT(differenceBetween(label, newJump) == REPTACH_OFFSET_CALL_R11);
         return Call::fromTailJump(newJump);

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp
index 89f2bfb..9e7eb7f 100644 (file)
--- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp
@@ -1980,7 +1980,9 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi
 
         ScopeChainNode* scopeChain = callFrame->scopeChain();
         ScopeChainIterator iter = scopeChain->begin();
+#if !ASSERT_DISABLED
         ScopeChainIterator end = scopeChain->end();
+#endif
         ASSERT(iter != end);
         while (skip--) {
             ++iter;
@@ -2003,7 +2005,9 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi
 
         ScopeChainNode* scopeChain = callFrame->scopeChain();
         ScopeChainIterator iter = scopeChain->begin();
+#if !ASSERT_DISABLED
         ScopeChainIterator end = scopeChain->end();
+#endif
         ASSERT(iter != end);
         while (skip--) {
             ++iter;