compiler: change escape maps to hash tables
Also use just one table lookup, not two.
Change-Id: Iddebaabb7d276f65e70b021035071bfc7c8a75ec
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/197759
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
diff --git a/go/escape.cc b/go/escape.cc
index 91f43a6..bfd1a39 100644
--- a/go/escape.cc
+++ b/go/escape.cc
@@ -579,9 +579,9 @@
return false;
}
-std::map<Named_object*, Node*> Node::objects;
-std::map<Expression*, Node*> Node::expressions;
-std::map<Statement*, Node*> Node::statements;
+Unordered_map(Named_object*, Node*) Node::objects;
+Unordered_map(Expression*, Node*) Node::expressions;
+Unordered_map(Statement*, Node*) Node::statements;
std::vector<Node*> Node::indirects;
// Make a object node or return a cached node for this object.
@@ -589,13 +589,12 @@
Node*
Node::make_node(Named_object* no)
{
- if (Node::objects.find(no) != Node::objects.end())
- return Node::objects[no];
-
- Node* n = new Node(no);
- std::pair<Named_object*, Node*> val(no, n);
- Node::objects.insert(val);
- return n;
+ std::pair<Named_object*, Node*> val(no, NULL);
+ std::pair<Unordered_map(Named_object*, Node*)::iterator, bool> ins =
+ Node::objects.insert(val);
+ if (ins.second)
+ ins.first->second = new Node(no);
+ return ins.first->second;
}
// Make an expression node or return a cached node for this expression.
@@ -603,13 +602,12 @@
Node*
Node::make_node(Expression* e)
{
- if (Node::expressions.find(e) != Node::expressions.end())
- return Node::expressions[e];
-
- Node* n = new Node(e);
- std::pair<Expression*, Node*> val(e, n);
- Node::expressions.insert(val);
- return n;
+ std::pair<Expression*, Node*> val(e, NULL);
+ std::pair<Unordered_map(Expression*, Node*)::iterator, bool> ins =
+ Node::expressions.insert(val);
+ if (ins.second)
+ ins.first->second = new Node(e);
+ return ins.first->second;
}
// Make a statement node or return a cached node for this statement.
@@ -617,13 +615,12 @@
Node*
Node::make_node(Statement* s)
{
- if (Node::statements.find(s) != Node::statements.end())
- return Node::statements[s];
-
- Node* n = new Node(s);
- std::pair<Statement*, Node*> val(s, n);
- Node::statements.insert(val);
- return n;
+ std::pair<Statement*, Node*> val(s, NULL);
+ std::pair<Unordered_map(Statement*, Node*)::iterator, bool> ins =
+ Node::statements.insert(val);
+ if (ins.second)
+ ins.first->second = new Node(s);
+ return ins.first->second;
}
// Make an indirect node with given child.
@@ -3447,19 +3444,22 @@
void
Node::reclaim_nodes()
{
- for (std::map<Named_object*, Node*>::iterator p = Node::objects.begin();
+ for (Unordered_map(Named_object*, Node*)::iterator p =
+ Node::objects.begin();
p != Node::objects.end();
++p)
delete p->second;
Node::objects.clear();
- for (std::map<Expression*, Node*>::iterator p = Node::expressions.begin();
+ for (Unordered_map(Expression*, Node*)::iterator p =
+ Node::expressions.begin();
p != Node::expressions.end();
++p)
delete p->second;
Node::expressions.clear();
- for (std::map<Statement*, Node*>::iterator p = Node::statements.begin();
+ for (Unordered_map(Statement*, Node*)::iterator p =
+ Node::statements.begin();
p != Node::statements.end();
++p)
delete p->second;
diff --git a/go/escape.h b/go/escape.h
index 88e23ce..e97b529 100644
--- a/go/escape.h
+++ b/go/escape.h
@@ -329,9 +329,9 @@
Node* child_;
// Cache all the Nodes created via Node::make_node to make the API simpler.
- static std::map<Named_object*, Node*> objects;
- static std::map<Expression*, Node*> expressions;
- static std::map<Statement*, Node*> statements;
+ static Unordered_map(Named_object*, Node*) objects;
+ static Unordered_map(Expression*, Node*) expressions;
+ static Unordered_map(Statement*, Node*) statements;
// Collection of all NODE_INDIRECT Nodes, used for reclaiming memory. This
// is not a cache -- each make_indirect_node will make a fresh Node.
