2
# User Andrew Paprocki <andrew@ishiboo.com>
3
# Date 1310430767 25200
4
# Node ID 691294843828d5b4108559b27bfe342ce3b146ef
5
# Parent 9b2e6ea86756ae95f7f5b03799663e810877ecfc
6
Bug 665819: build fix for ENABLE_YARR_JIT=0, r=dmandelin
8
diff --git a/js/src/jsregexpinlines.h b/js/src/jsregexpinlines.h
9
--- a/js/src/jsregexpinlines.h
10
+++ b/js/src/jsregexpinlines.h
11
@@ -486,17 +486,19 @@ RegExp::compileHelper(JSContext *cx, JSL
13
JSC::Yarr::JSGlobalData globalData(cx->compartment->jaegerCompartment()->execAlloc());
14
JSC::Yarr::jitCompile(yarrPattern, &globalData, codeBlock);
15
if (!codeBlock.isFallBack())
21
codeBlock.setFallBack(true);
23
byteCode = JSC::Yarr::byteCompile(yarrPattern, cx->compartment->regExpAllocator).get();
29
RegExp::compile(JSContext *cx, TokenStream *ts)
31
diff --git a/js/src/yarr/OSAllocatorPosix.cpp b/js/src/yarr/OSAllocatorPosix.cpp
32
--- a/js/src/yarr/OSAllocatorPosix.cpp
33
+++ b/js/src/yarr/OSAllocatorPosix.cpp
35
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
36
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
37
* THE POSSIBILITY OF SUCH DAMAGE.
39
* ***** END LICENSE BLOCK ***** */
41
#include "assembler/wtf/Platform.h"
43
-#if ENABLE_ASSEMBLER && WTF_OS_UNIX && !WTF_OS_SYMBIAN
44
+#if WTF_OS_UNIX && !WTF_OS_SYMBIAN
46
#include "OSAllocator.h"
50
#include "wtf/Assertions.h"
53
diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h
54
--- a/js/src/yarr/wtfbridge.h
55
+++ b/js/src/yarr/wtfbridge.h
57
* definitions for use by Yarr.
63
#include "vm/String.h"
64
#include "assembler/wtf/Platform.h"
66
#include "assembler/jit/ExecutableAllocator.h"
69
namespace JSC { namespace Yarr {
72
* Basic type definitions.
76
@@ -256,27 +258,31 @@ class Vector<OwnPtr<T> > {
79
template <typename T, size_t N>
81
deleteAllValues(Vector<T, N> &v) {
88
* Minimal JSGlobalData. This used by Yarr to get the allocator.
92
ExecutableAllocator *regexAllocator;
94
JSGlobalData(ExecutableAllocator *regexAllocator)
95
: regexAllocator(regexAllocator) { }
101
* Sentinel value used in Yarr.
103
const size_t notFound = size_t(-1);
106
* Do-nothing version of a macro used by WTF to avoid unused
107
* parameter warnings.