equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 58ae98c85e39def96a90cb21c90e871f41a03a71 |
2 # Parent 2c9bf1336fd0811e0112953334df4c81c717e6ff |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
4 Bug 746112 - RegExp hang on ppc64 in execute. |
4 Bug 746112 - RegExp hang on ppc64 in execute. |
5 Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 |
5 Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 |
6 |
6 |
7 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h |
7 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h |
8 --- a/js/src/yarr/YarrInterpreter.h |
8 --- a/js/src/yarr/YarrInterpreter.h |
9 +++ b/js/src/yarr/YarrInterpreter.h |
9 +++ b/js/src/yarr/YarrInterpreter.h |
10 @@ -162,17 +162,17 @@ struct ByteTerm { |
10 @@ -159,17 +159,17 @@ struct ByteTerm { |
11 , m_invert(invert) |
11 , m_invert(invert) |
12 { |
12 { |
13 atom.characterClass = characterClass; |
13 atom.characterClass = characterClass; |
14 atom.quantityType = QuantifierFixedCount; |
14 atom.quantityType = QuantifierFixedCount; |
15 atom.quantityCount = 1; |
15 atom.quantityCount = 1; |
24 { |
24 { |
25 atom.subpatternId = subpatternId; |
25 atom.subpatternId = subpatternId; |
26 atom.parenthesesDisjunction = parenthesesInfo; |
26 atom.parenthesesDisjunction = parenthesesInfo; |
27 atom.quantityType = QuantifierFixedCount; |
27 atom.quantityType = QuantifierFixedCount; |
28 atom.quantityCount = 1; |
28 atom.quantityCount = 1; |
29 @@ -183,17 +183,17 @@ struct ByteTerm { |
29 @@ -180,17 +180,17 @@ struct ByteTerm { |
30 : type(type) |
30 : type(type) |
31 , m_capture(false) |
31 , m_capture(false) |
32 , m_invert(invert) |
32 , m_invert(invert) |
33 { |
33 { |
34 atom.quantityType = QuantifierFixedCount; |
34 atom.quantityType = QuantifierFixedCount; |
46 atom.quantityCount = 1; |
46 atom.quantityCount = 1; |
47 inputPosition = inputPos; |
47 inputPosition = inputPos; |
48 diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h |
48 diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h |
49 --- a/js/src/yarr/YarrPattern.h |
49 --- a/js/src/yarr/YarrPattern.h |
50 +++ b/js/src/yarr/YarrPattern.h |
50 +++ b/js/src/yarr/YarrPattern.h |
51 @@ -166,17 +166,17 @@ struct PatternTerm { |
51 @@ -179,17 +179,17 @@ struct PatternTerm { |
52 , m_capture(false) |
52 , m_capture(false) |
53 , m_invert(invert) |
53 , m_invert(invert) |
54 { |
54 { |
55 characterClass = charClass; |
55 characterClass = charClass; |
56 quantityType = QuantifierFixedCount; |
56 quantityType = QuantifierFixedCount; |
68 parentheses.isCopy = false; |
68 parentheses.isCopy = false; |
69 parentheses.isTerminal = false; |
69 parentheses.isTerminal = false; |
70 diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c |
70 diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c |
71 --- a/memory/mozjemalloc/jemalloc.c |
71 --- a/memory/mozjemalloc/jemalloc.c |
72 +++ b/memory/mozjemalloc/jemalloc.c |
72 +++ b/memory/mozjemalloc/jemalloc.c |
73 @@ -1086,17 +1086,19 @@ struct arena_s { |
73 @@ -1099,17 +1099,19 @@ struct arena_s { |
74 static unsigned ncpus; |
74 static unsigned ncpus; |
75 #endif |
75 #endif |
76 |
76 |
77 /* |
77 /* |
78 * When MALLOC_STATIC_SIZES is defined most of the parameters |
78 * When MALLOC_STATIC_SIZES is defined most of the parameters |
86 #ifdef MALLOC_STATIC_SIZES |
86 #ifdef MALLOC_STATIC_SIZES |
87 |
87 |
88 /* |
88 /* |
89 * VM page size. It must divide the runtime CPU page size or the code |
89 * VM page size. It must divide the runtime CPU page size or the code |
90 * will abort. |
90 * will abort. |
|
91 * Platform specific page size conditions copied from js/public/HeapAPI.h |
91 */ |
92 */ |
92 #define pagesize_2pow ((size_t) 12) |
|
93 diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h |
93 diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h |
94 --- a/mfbt/double-conversion/utils.h |
94 --- a/mfbt/double-conversion/utils.h |
95 +++ b/mfbt/double-conversion/utils.h |
95 +++ b/mfbt/double-conversion/utils.h |
96 @@ -50,17 +50,17 @@ |
96 @@ -50,17 +50,17 @@ |
97 // the result is equal to 89255e-22. |
97 // the result is equal to 89255e-22. |