Chromium Code Reviews| Index: src/heap.h |
| diff --git a/src/heap.h b/src/heap.h |
| index 212dfa7a7c2d52dd7c25dea253f639fa21740f00..92e80d67afca0d3a42d5757b58ea04b633297dd5 100644 |
| --- a/src/heap.h |
| +++ b/src/heap.h |
| @@ -34,7 +34,7 @@ namespace v8 { |
| namespace internal { |
| // Defines all the roots in Heap. |
| -#define STRONG_ROOT_LIST(V) \ |
| +#define UNCONDITIONAL_STRONG_ROOT_LIST(V) \ |
| V(Map, meta_map, MetaMap) \ |
| V(Map, heap_number_map, HeapNumberMap) \ |
| V(Map, short_string_map, ShortStringMap) \ |
| @@ -135,6 +135,13 @@ namespace internal { |
| V(Object, last_script_id, LastScriptId) \ |
| V(Smi, stack_limit, StackLimit) |
| +#if V8_TARGET_ARCH_ARM && V8_NATIVE_REGEXP |
|
Erik Corry
2009/08/28 09:47:03
Ugh
Lasse Reichstein
2009/08/28 11:43:15
Agree, but it still seems better than having an un
|
| +#define STRONG_ROOT_LIST(V) \ |
| + UNCONDITIONAL_STRONG_ROOT_LIST(V) \ |
| + V(Code, re_c_entry_code, RegExpCEntryCode) |
| +#else |
| +#define STRONG_ROOT_LIST(V) UNCONDITIONAL_STRONG_ROOT_LIST(V) |
| +#endif |
| #define ROOT_LIST(V) \ |
| STRONG_ROOT_LIST(V) \ |
| @@ -1024,6 +1031,9 @@ class Heap : public AllStatic { |
| static void CreateCEntryDebugBreakStub(); |
| static void CreateJSEntryStub(); |
| static void CreateJSConstructEntryStub(); |
| +#if V8_TARGET_ARCH_ARM && V8_NATIVE_REGEXP |
|
Erik Corry
2009/08/28 09:47:03
Can't we remove the #if here?
Lasse Reichstein
2009/08/28 11:43:15
Sure. We still won't implement the function unless
|
| + static void CreateRegExpCEntryStub(); |
| +#endif |
| static void CreateFixedStubs(); |
| static Object* CreateOddball(Map* map, |