diff options
Diffstat (limited to 'runtime/globals.h')
| -rw-r--r-- | runtime/globals.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/runtime/globals.h b/runtime/globals.h index 9c6fa0d..f2d6862 100644 --- a/runtime/globals.h +++ b/runtime/globals.h @@ -19,7 +19,7 @@ #include <stddef.h> #include <stdint.h> -#include "brooks_pointer.h" +#include "read_barrier.h" namespace art { @@ -97,12 +97,20 @@ static constexpr bool kMovingMethods = false; // code, if possible. static constexpr bool kEmbedClassInCode = true; -#ifdef USE_BROOKS_POINTER -static constexpr bool kUseBrooksPointer = true; +#ifdef USE_BAKER_READ_BARRIER +static constexpr bool kUseBakerReadBarrier = true; #else -static constexpr bool kUseBrooksPointer = false; +static constexpr bool kUseBakerReadBarrier = false; #endif +#ifdef USE_BROOKS_READ_BARRIER +static constexpr bool kUseBrooksReadBarrier = true; +#else +static constexpr bool kUseBrooksReadBarrier = false; +#endif + +static constexpr bool kUseBakerOrBrooksReadBarrier = kUseBakerReadBarrier || kUseBrooksReadBarrier; + // If true, references within the heap are poisoned (negated). static constexpr bool kPoisonHeapReferences = false; |