diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/v8/src/macro-assembler.h | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
| download | qtwebengine-chromium-3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859.tar.gz | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/v8/src/macro-assembler.h')
| -rw-r--r-- | chromium/v8/src/macro-assembler.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chromium/v8/src/macro-assembler.h b/chromium/v8/src/macro-assembler.h index b59fd3b94d4..5ea96575156 100644 --- a/chromium/v8/src/macro-assembler.h +++ b/chromium/v8/src/macro-assembler.h @@ -135,11 +135,11 @@ class FrameAndConstantPoolScope { : masm_(masm), type_(type), old_has_frame_(masm->has_frame()), - old_constant_pool_available_(FLAG_enable_ool_constant_pool && - masm->is_ool_constant_pool_available()) { + old_constant_pool_available_(FLAG_enable_embedded_constant_pool && + masm->is_constant_pool_available()) { masm->set_has_frame(true); - if (FLAG_enable_ool_constant_pool) { - masm->set_ool_constant_pool_available(true); + if (FLAG_enable_embedded_constant_pool) { + masm->set_constant_pool_available(true); } if (type_ != StackFrame::MANUAL && type_ != StackFrame::NONE) { masm->EnterFrame(type, !old_constant_pool_available_); @@ -149,8 +149,8 @@ class FrameAndConstantPoolScope { ~FrameAndConstantPoolScope() { masm_->LeaveFrame(type_); masm_->set_has_frame(old_has_frame_); - if (FLAG_enable_ool_constant_pool) { - masm_->set_ool_constant_pool_available(old_constant_pool_available_); + if (FLAG_enable_embedded_constant_pool) { + masm_->set_constant_pool_available(old_constant_pool_available_); } } @@ -178,15 +178,15 @@ class ConstantPoolUnavailableScope { public: explicit ConstantPoolUnavailableScope(MacroAssembler* masm) : masm_(masm), - old_constant_pool_available_(FLAG_enable_ool_constant_pool && - masm->is_ool_constant_pool_available()) { - if (FLAG_enable_ool_constant_pool) { - masm_->set_ool_constant_pool_available(false); + old_constant_pool_available_(FLAG_enable_embedded_constant_pool && + masm->is_constant_pool_available()) { + if (FLAG_enable_embedded_constant_pool) { + masm_->set_constant_pool_available(false); } } ~ConstantPoolUnavailableScope() { - if (FLAG_enable_ool_constant_pool) { - masm_->set_ool_constant_pool_available(old_constant_pool_available_); + if (FLAG_enable_embedded_constant_pool) { + masm_->set_constant_pool_available(old_constant_pool_available_); } } |