Bug 990154: move the enum CodeKind definition outside #if ENABLE_ASSEMBLER to unbreak non-asm platforms r=jandem
authorLandry Breuil <landry@openbsd.org>
Tue, 15 Apr 2014 13:46:07 +0200
changeset 197053 4d46754ac133ecbc09f2a311340ab17a79b9443e
parent 197052 f2808e5f4afe113d914b6e332411c765d6a3b06b
child 197054 114e382f5a216b7d311c1e94ea9b711baff8fe3e
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs990154
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 990154: move the enum CodeKind definition outside #if ENABLE_ASSEMBLER to unbreak non-asm platforms r=jandem
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;