diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:51 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:51 +0100 |
| commit | 47c78dea382da032f7baace418e06388c056c820 (patch) | |
| tree | 0e6b1c8ba2a60828f1ad77288341b843244e9c6c /Source/JavaScriptCore | |
| parent | d75f99832922079640818fae49a92bb0cf45dfb8 (diff) | |
| parent | ba4c0fc7927b0fd6d2fa71aceda8136094581e2d (diff) | |
| download | qtwebkit-47c78dea382da032f7baace418e06388c056c820.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I80322f19cc94708fa424ee44fdcc04ede82ecd24
Diffstat (limited to 'Source/JavaScriptCore')
4 files changed, 4 insertions, 11 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp index 6fc08bcb3..ca0fa210a 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -74,7 +74,7 @@ static bool isVFPPresent() const bool MacroAssemblerARM::s_isVFPPresent = isVFPPresent(); -#if CPU(ARMV5_OR_LOWER) +#if !CPU(ARM_FEATURE_UNALIGNED) /* On ARMv5 and below, natural alignment is required. */ void MacroAssemblerARM::load32WithUnalignedHalfWords(BaseIndex address, RegisterID dest) { diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h index 9058514dc..d9093413f 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h @@ -393,7 +393,7 @@ public: m_assembler.baseIndexTransfer32(ARMAssembler::LoadUint32, dest, address.base, address.index, static_cast<int>(address.scale), address.offset); } -#if CPU(ARMV5_OR_LOWER) +#if !CPU(ARM_FEATURE_UNALIGNED) void load32WithUnalignedHalfWords(BaseIndex address, RegisterID dest); #else void load32WithUnalignedHalfWords(BaseIndex address, RegisterID dest) diff --git a/Source/JavaScriptCore/dfg/DFGAbstractState.cpp b/Source/JavaScriptCore/dfg/DFGAbstractState.cpp index 19bad5c09..eff653636 100644 --- a/Source/JavaScriptCore/dfg/DFGAbstractState.cpp +++ b/Source/JavaScriptCore/dfg/DFGAbstractState.cpp @@ -476,6 +476,7 @@ bool AbstractState::executeEffects(unsigned indexInBlock, Node* node) } case MakeRope: { + node->setCanExit(true); forNode(node).set(m_graph.m_vm.stringStructure.get()); break; } diff --git a/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp index 7823cd2d2..ea2217924 100644 --- a/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +++ b/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp @@ -31,20 +31,12 @@ #include "CodeProfiling.h" #include <errno.h> -#include <unistd.h> #include <wtf/MetaAllocator.h> #include <wtf/PageReservation.h> #include <wtf/VMTags.h> -#if OS(DARWIN) -#include <sys/mman.h> -#endif - -#if OS(LINUX) -#include <stdio.h> -#endif - #if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090 +#include <sys/mman.h> // MADV_FREE_REUSABLE does not work for JIT memory on older OSes so use MADV_FREE in that case. #define WTF_USE_MADV_FREE_FOR_JIT_MEMORY 1 #endif |