| Index: runtime/vm/assembler_arm.h
|
| diff --git a/runtime/vm/assembler_arm.h b/runtime/vm/assembler_arm.h
|
| index 70dd9ad5f0b2b0c7f99fb16f1e87868e64970711..0fb77266ee1cd8b4a2776d6fbb55e998793fa984 100644
|
| --- a/runtime/vm/assembler_arm.h
|
| +++ b/runtime/vm/assembler_arm.h
|
| @@ -319,7 +319,7 @@ class Assembler : public ValueObject {
|
| prologue_offset_(-1),
|
| use_far_branches_(use_far_branches),
|
| comments_(),
|
| - allow_constant_pool_(true) { }
|
| + constant_pool_allowed_(true) { }
|
|
|
| ~Assembler() { }
|
|
|
| @@ -965,11 +965,11 @@ class Assembler : public ValueObject {
|
| static bool IsSafe(const Object& object) { return true; }
|
| static bool IsSafeSmi(const Object& object) { return object.IsSmi(); }
|
|
|
| - bool allow_constant_pool() const {
|
| - return allow_constant_pool_;
|
| + bool constant_pool_allowed() const {
|
| + return constant_pool_allowed_;
|
| }
|
| - void set_allow_constant_pool(bool b) {
|
| - allow_constant_pool_ = b;
|
| + void set_constant_pool_allowed(bool b) {
|
| + constant_pool_allowed_ = b;
|
| }
|
|
|
| private:
|
| @@ -1005,7 +1005,7 @@ class Assembler : public ValueObject {
|
|
|
| GrowableArray<CodeComment*> comments_;
|
|
|
| - bool allow_constant_pool_;
|
| + bool constant_pool_allowed_;
|
|
|
| void LoadObjectHelper(Register rd,
|
| const Object& object,
|
|
|