Commit d45e7898 authored by Jaroslav Sevcik's avatar Jaroslav Sevcik Committed by Commit Bot

[turbofan] Rename *Unless to *IfNot in the graph assembler.

Bug: v8:5267
Change-Id: I0a94b1c2df3d5d0871e36c0f688a5d7d88179a09
Reviewed-on: https://chromium-review.googlesource.com/640370
Commit-Queue: Jaroslav Sevcik <jarin@chromium.org>
Commit-Queue: Benedikt Meurer <bmeurer@chromium.org>
Reviewed-by: 's avatarBenedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47660}
parent de839c56
This diff is collapsed.
...@@ -172,18 +172,18 @@ Node* GraphAssembler::DeoptimizeIf(DeoptimizeReason reason, Node* condition, ...@@ -172,18 +172,18 @@ Node* GraphAssembler::DeoptimizeIf(DeoptimizeReason reason, Node* condition,
frame_state, current_effect_, current_control_); frame_state, current_effect_, current_control_);
} }
Node* GraphAssembler::DeoptimizeUnless(DeoptimizeKind kind, Node* GraphAssembler::DeoptimizeIfNot(DeoptimizeKind kind,
DeoptimizeReason reason, Node* condition, DeoptimizeReason reason, Node* condition,
Node* frame_state) { Node* frame_state) {
return current_control_ = current_effect_ = graph()->NewNode( return current_control_ = current_effect_ = graph()->NewNode(
common()->DeoptimizeUnless(kind, reason), condition, frame_state, common()->DeoptimizeUnless(kind, reason), condition, frame_state,
current_effect_, current_control_); current_effect_, current_control_);
} }
Node* GraphAssembler::DeoptimizeUnless(DeoptimizeReason reason, Node* condition, Node* GraphAssembler::DeoptimizeIfNot(DeoptimizeReason reason, Node* condition,
Node* frame_state) { Node* frame_state) {
return DeoptimizeUnless(DeoptimizeKind::kEager, reason, condition, return DeoptimizeIfNot(DeoptimizeKind::kEager, reason, condition,
frame_state); frame_state);
} }
void GraphAssembler::Branch(Node* condition, GraphAssemblerLabel<0u>* if_true, void GraphAssembler::Branch(Node* condition, GraphAssemblerLabel<0u>* if_true,
......
...@@ -202,10 +202,10 @@ class GraphAssembler { ...@@ -202,10 +202,10 @@ class GraphAssembler {
Node* DeoptimizeIf(DeoptimizeReason reason, Node* condition, Node* DeoptimizeIf(DeoptimizeReason reason, Node* condition,
Node* frame_state); Node* frame_state);
Node* DeoptimizeUnless(DeoptimizeKind kind, DeoptimizeReason reason, Node* DeoptimizeIfNot(DeoptimizeKind kind, DeoptimizeReason reason,
Node* condition, Node* frame_state); Node* condition, Node* frame_state);
Node* DeoptimizeUnless(DeoptimizeReason reason, Node* condition, Node* DeoptimizeIfNot(DeoptimizeReason reason, Node* condition,
Node* frame_state); Node* frame_state);
template <typename... Args> template <typename... Args>
Node* Call(const CallDescriptor* desc, Args... args); Node* Call(const CallDescriptor* desc, Args... args);
template <typename... Args> template <typename... Args>
...@@ -227,10 +227,10 @@ class GraphAssembler { ...@@ -227,10 +227,10 @@ class GraphAssembler {
void GotoIf(Node* condition, GraphAssemblerLabel<sizeof...(Vars)>* label, void GotoIf(Node* condition, GraphAssemblerLabel<sizeof...(Vars)>* label,
Vars...); Vars...);
// {GotoUnless(c, l)} is equivalent to {Branch(c, templ, l);Bind(templ)}. // {GotoIfNot(c, l)} is equivalent to {Branch(c, templ, l);Bind(templ)}.
template <typename... Vars> template <typename... Vars>
void GotoUnless(Node* condition, GraphAssemblerLabel<sizeof...(Vars)>* label, void GotoIfNot(Node* condition, GraphAssemblerLabel<sizeof...(Vars)>* label,
Vars...); Vars...);
// Extractors (should be only used when destructing/resetting the assembler). // Extractors (should be only used when destructing/resetting the assembler).
Node* ExtractCurrentControl(); Node* ExtractCurrentControl();
...@@ -353,9 +353,9 @@ void GraphAssembler::GotoIf(Node* condition, ...@@ -353,9 +353,9 @@ void GraphAssembler::GotoIf(Node* condition,
} }
template <typename... Vars> template <typename... Vars>
void GraphAssembler::GotoUnless(Node* condition, void GraphAssembler::GotoIfNot(Node* condition,
GraphAssemblerLabel<sizeof...(Vars)>* label, GraphAssemblerLabel<sizeof...(Vars)>* label,
Vars... vars) { Vars... vars) {
BranchHint hint = label->IsDeferred() ? BranchHint::kTrue : BranchHint::kNone; BranchHint hint = label->IsDeferred() ? BranchHint::kTrue : BranchHint::kNone;
Node* branch = Node* branch =
graph()->NewNode(common()->Branch(hint), condition, current_control_); graph()->NewNode(common()->Branch(hint), condition, current_control_);
......
...@@ -215,7 +215,7 @@ void MemoryOptimizer::VisitAllocate(Node* node, AllocationState const* state) { ...@@ -215,7 +215,7 @@ void MemoryOptimizer::VisitAllocate(Node* node, AllocationState const* state) {
machine()->Is64() ? __ ChangeInt32ToInt64(size) : size), machine()->Is64() ? __ ChangeInt32ToInt64(size) : size),
limit); limit);
__ GotoUnless(check, &call_runtime); __ GotoIfNot(check, &call_runtime);
__ Goto(&done, top); __ Goto(&done, top);
__ Bind(&call_runtime); __ Bind(&call_runtime);
...@@ -267,7 +267,7 @@ void MemoryOptimizer::VisitAllocate(Node* node, AllocationState const* state) { ...@@ -267,7 +267,7 @@ void MemoryOptimizer::VisitAllocate(Node* node, AllocationState const* state) {
// Check if we can do bump pointer allocation here. // Check if we can do bump pointer allocation here.
Node* check = __ UintLessThan(new_top, limit); Node* check = __ UintLessThan(new_top, limit);
__ GotoUnless(check, &call_runtime); __ GotoIfNot(check, &call_runtime);
__ Store(StoreRepresentation(MachineType::PointerRepresentation(), __ Store(StoreRepresentation(MachineType::PointerRepresentation(),
kNoWriteBarrier), kNoWriteBarrier),
top_address, __ IntPtrConstant(0), new_top); top_address, __ IntPtrConstant(0), new_top);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment