Commit 8852d854 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

[jumbo] Rename one of the ResolveRenames

Recently* a second ResolveRenames appeared in
typed-optimization.cc. In some extreme (non-default) jumbo
builds that file shared translation unit (and thus anonymous
namespace) with load-elimination.cc which also has a
ResolveRenames which is slightly different.

To avoid that name clash and failed compilation, this
renames ResolveRenames -> ResolveRenamesForOpt.

*) It appeared in
 https://chromium-review.googlesource.com/c/v8/v8/+/1609803

Change-Id: Ia175468a8e978e93e95da1d28f74cee8dce253d2
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1615465
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: 's avatarTobias Tebbi <tebbi@chromium.org>
Auto-Submit: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#61655}
parent 9a6f52f5
...@@ -113,7 +113,7 @@ base::Optional<MapRef> GetStableMapFromObjectType(JSHeapBroker* broker, ...@@ -113,7 +113,7 @@ base::Optional<MapRef> GetStableMapFromObjectType(JSHeapBroker* broker,
return {}; return {};
} }
Node* ResolveRenames(Node* node) { Node* ResolveSameValueRenames(Node* node) {
while (true) { while (true) {
switch (node->opcode()) { switch (node->opcode()) {
case IrOpcode::kCheckHeapObject: case IrOpcode::kCheckHeapObject:
...@@ -527,7 +527,7 @@ Reduction TypedOptimization::ReduceSameValue(Node* node) { ...@@ -527,7 +527,7 @@ Reduction TypedOptimization::ReduceSameValue(Node* node) {
Node* const rhs = NodeProperties::GetValueInput(node, 1); Node* const rhs = NodeProperties::GetValueInput(node, 1);
Type const lhs_type = NodeProperties::GetType(lhs); Type const lhs_type = NodeProperties::GetType(lhs);
Type const rhs_type = NodeProperties::GetType(rhs); Type const rhs_type = NodeProperties::GetType(rhs);
if (ResolveRenames(lhs) == ResolveRenames(rhs)) { if (ResolveSameValueRenames(lhs) == ResolveSameValueRenames(rhs)) {
if (NodeProperties::GetType(node).IsNone()) { if (NodeProperties::GetType(node).IsNone()) {
return NoChange(); return NoChange();
} }
......
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