Bug 990154: move the enum CodeKind definition outside #if ENABLE_ASSEMBLER to unbreak non-asm platforms r=jandem,a=lsblakk
authorLandry Breuil <landry@openbsd.org>
Thu, 17 Apr 2014 22:24:09 +0200
changeset 191926 09f4010d6f77e6eb06465c847315a6fdbaba9df1
parent 191925 48044e4a424243bbbced01dc3402a43d61ee8a02
child 191927 19010f5554b096332e77cb1b2a9f0083e8a0d629
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem, lsblakk
bugs990154
milestone30.0a2
Bug 990154: move the enum CodeKind definition outside #if ENABLE_ASSEMBLER to unbreak non-asm platforms r=jandem,a=lsblakk
js/src/assembler/jit/ExecutableAllocator.h
--- a/js/src/assembler/jit/ExecutableAllocator.h
+++ b/js/src/assembler/jit/ExecutableAllocator.h
@@ -68,30 +68,32 @@ extern  "C" void sync_instruction_memory
 #if ENABLE_ASSEMBLER_WX_EXCLUSIVE
 #define PROTECTION_FLAGS_RW (PROT_READ | PROT_WRITE)
 #define PROTECTION_FLAGS_RX (PROT_READ | PROT_EXEC)
 #define INITIAL_PROTECTION_FLAGS PROTECTION_FLAGS_RX
 #else
 #define INITIAL_PROTECTION_FLAGS (PROT_READ | PROT_WRITE | PROT_EXEC)
 #endif
 
+namespace JSC {
+  enum CodeKind { ION_CODE = 0, BASELINE_CODE, REGEXP_CODE, OTHER_CODE };
+}
+
 #if ENABLE_ASSEMBLER
 
 //#define DEBUG_STRESS_JSC_ALLOCATOR
 
 namespace JS {
     struct CodeSizes;
 }
 
 namespace JSC {
 
   class ExecutableAllocator;
 
-  enum CodeKind { ION_CODE = 0, BASELINE_CODE, REGEXP_CODE, OTHER_CODE };
-
   // These are reference-counted. A new one starts with a count of 1.
   class ExecutablePool {
 
     friend class ExecutableAllocator;
 private:
     struct Allocation {
         char* pages;
         size_t size;