aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar laurentlb <laurentlb@google.com>2017-08-17 13:08:49 +0200
committerGravatar Irina Iancu <elenairina@google.com>2017-08-18 09:00:31 +0200
commit3ca2a10d6fb5742b2026819052a242f169650709 (patch)
tree0d61bdaa0bf4d37983048ad6b8c328ccf8e0360e /src
parent2b25a2a85a7b4d743eb3f38138bb350a19295077 (diff)
Delete cachedSymbols from LoadStatement.
We rarely need it, it's not useful to keep it in memory. RELNOTES: None. PiperOrigin-RevId: 165562119
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java b/src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java
index d75f21e2cc..d451333501 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java
@@ -24,7 +24,6 @@ import java.util.Map;
public final class LoadStatement extends Statement {
private final ImmutableMap<Identifier, String> symbolMap;
- private final ImmutableList<Identifier> cachedSymbols; // to save time
private final StringLiteral imp;
/**
@@ -37,7 +36,6 @@ public final class LoadStatement extends Statement {
public LoadStatement(StringLiteral imp, Map<Identifier, String> symbolMap) {
this.imp = imp;
this.symbolMap = ImmutableMap.copyOf(symbolMap);
- this.cachedSymbols = ImmutableList.copyOf(symbolMap.keySet());
}
public ImmutableMap<Identifier, String> getSymbolMap() {
@@ -45,7 +43,7 @@ public final class LoadStatement extends Statement {
}
public ImmutableList<Identifier> getSymbols() {
- return cachedSymbols;
+ return ImmutableList.copyOf(symbolMap.keySet());
}
public StringLiteral getImport() {
@@ -57,7 +55,7 @@ public final class LoadStatement extends Statement {
printIndent(buffer, indentLevel);
buffer.append("load(");
imp.prettyPrint(buffer);
- for (Identifier symbol : cachedSymbols) {
+ for (Identifier symbol : symbolMap.keySet()) {
buffer.append(", ");
String origName = symbolMap.get(symbol);
if (origName.equals(symbol.getName())) {
@@ -112,7 +110,7 @@ public final class LoadStatement extends Statement {
@Override
void validate(ValidationEnvironment env) throws EvalException {
- for (Identifier symbol : cachedSymbols) {
+ for (Identifier symbol : symbolMap.keySet()) {
env.declare(symbol.getName(), getLocation());
}
}