| Index: src/assembler.h
|
| diff --git a/src/assembler.h b/src/assembler.h
|
| index ab37cd9dab871dc6dbc966cb0dee04fbdef8626a..fc2c0cd3a6d0a397d54981d513de54d6bf3df92c 100644
|
| --- a/src/assembler.h
|
| +++ b/src/assembler.h
|
| @@ -79,11 +79,11 @@ class AssemblerBase: public Malloced {
|
| return (enabled_cpu_features_ & (static_cast<uint64_t>(1) << f)) != 0;
|
| }
|
|
|
| - bool is_ool_constant_pool_available() const {
|
| - if (FLAG_enable_ool_constant_pool) {
|
| - return ool_constant_pool_available_;
|
| + bool is_constant_pool_available() const {
|
| + if (FLAG_enable_ool_constant_pool || FLAG_enable_embedded_constant_pool) {
|
| + return constant_pool_available_;
|
| } else {
|
| - // Out-of-line constant pool not supported on this architecture.
|
| + // Constant pool not supported on this architecture.
|
| UNREACHABLE();
|
| return false;
|
| }
|
| @@ -108,11 +108,11 @@ class AssemblerBase: public Malloced {
|
| int buffer_size_;
|
| bool own_buffer_;
|
|
|
| - void set_ool_constant_pool_available(bool available) {
|
| - if (FLAG_enable_ool_constant_pool) {
|
| - ool_constant_pool_available_ = available;
|
| + void set_constant_pool_available(bool available) {
|
| + if (FLAG_enable_ool_constant_pool || FLAG_enable_embedded_constant_pool) {
|
| + constant_pool_available_ = available;
|
| } else {
|
| - // Out-of-line constant pool not supported on this architecture.
|
| + // Constant pool not supported on this architecture.
|
| UNREACHABLE();
|
| }
|
| }
|
| @@ -130,7 +130,7 @@ class AssemblerBase: public Malloced {
|
|
|
| // Indicates whether the constant pool can be accessed, which is only possible
|
| // if the pp register points to the current code object's constant pool.
|
| - bool ool_constant_pool_available_;
|
| + bool constant_pool_available_;
|
|
|
| // Constant pool.
|
| friend class FrameAndConstantPoolScope;
|
| @@ -815,6 +815,7 @@ class ExternalReference BASE_EMBEDDED {
|
| // Object* f(v8::internal::Arguments).
|
| BUILTIN_CALL, // default
|
|
|
| +
|
| // Builtin that takes float arguments and returns an int.
|
| // int f(double, double).
|
| BUILTIN_COMPARE_CALL,
|
|
|