Rename ValueNameGenerator to NumberGenerator
We will be using the generator for block numbering as well.
Change-Id: I8d8402157482f3189d2c91ba656c9be7600e82c3
diff --git a/src/main/java/com/android/tools/r8/graph/CfCode.java b/src/main/java/com/android/tools/r8/graph/CfCode.java
index 24237bb..16533fe 100644
--- a/src/main/java/com/android/tools/r8/graph/CfCode.java
+++ b/src/main/java/com/android/tools/r8/graph/CfCode.java
@@ -20,8 +20,8 @@
import com.android.tools.r8.errors.InvalidDebugInfoException;
import com.android.tools.r8.errors.Unimplemented;
import com.android.tools.r8.ir.code.IRCode;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.Position;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.conversion.CfSourceCode;
import com.android.tools.r8.ir.conversion.IRBuilder;
import com.android.tools.r8.ir.conversion.MethodProcessor;
@@ -298,7 +298,7 @@
ProgramMethod context,
ProgramMethod method,
AppView<?> appView,
- ValueNumberGenerator valueNumberGenerator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
@@ -313,7 +313,7 @@
ProgramMethod context,
ProgramMethod method,
AppView<?> appView,
- ValueNumberGenerator generator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
@@ -323,13 +323,13 @@
context,
method,
appView,
- generator,
+ valueNumberGenerator,
callerPosition,
origin,
methodProcessor);
} else {
return internalBuildWithLocals(
- context, method, appView, generator, callerPosition, origin, methodProcessor);
+ context, method, appView, valueNumberGenerator, callerPosition, origin, methodProcessor);
}
}
@@ -338,7 +338,7 @@
ProgramMethod context,
ProgramMethod method,
AppView<?> appView,
- ValueNumberGenerator generator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
@@ -348,7 +348,7 @@
context,
method,
appView,
- generator,
+ valueNumberGenerator,
callerPosition,
origin,
methodProcessor);
@@ -359,7 +359,7 @@
context,
method,
appView,
- generator,
+ valueNumberGenerator,
callerPosition,
origin,
methodProcessor);
@@ -372,7 +372,7 @@
ProgramMethod context,
ProgramMethod method,
AppView<?> appView,
- ValueNumberGenerator generator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
@@ -389,7 +389,7 @@
methodProcessor == null
? IRBuilder.create(method, appView, source, origin)
: IRBuilder.createForInlining(
- method, appView, source, origin, methodProcessor, generator);
+ method, appView, source, origin, methodProcessor, valueNumberGenerator);
return builder.build(context);
}
diff --git a/src/main/java/com/android/tools/r8/graph/Code.java b/src/main/java/com/android/tools/r8/graph/Code.java
index 9f384ca..bb11c69 100644
--- a/src/main/java/com/android/tools/r8/graph/Code.java
+++ b/src/main/java/com/android/tools/r8/graph/Code.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.dex.MixedSectionCollection;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.ir.code.IRCode;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.Position;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.conversion.MethodProcessor;
import com.android.tools.r8.ir.optimize.Outliner.OutlineCode;
import com.android.tools.r8.naming.ClassNameMapper;
@@ -23,7 +23,7 @@
ProgramMethod context,
ProgramMethod method,
AppView<?> appView,
- ValueNumberGenerator valueNumberGenerator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
diff --git a/src/main/java/com/android/tools/r8/graph/DexCode.java b/src/main/java/com/android/tools/r8/graph/DexCode.java
index 76bead8..ae3fe1e 100644
--- a/src/main/java/com/android/tools/r8/graph/DexCode.java
+++ b/src/main/java/com/android/tools/r8/graph/DexCode.java
@@ -12,8 +12,8 @@
import com.android.tools.r8.graph.DexCode.TryHandler.TypeAddrPair;
import com.android.tools.r8.graph.DexDebugEvent.StartLocal;
import com.android.tools.r8.ir.code.IRCode;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.Position;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.conversion.DexSourceCode;
import com.android.tools.r8.ir.conversion.IRBuilder;
import com.android.tools.r8.ir.conversion.MethodProcessor;
@@ -229,7 +229,7 @@
ProgramMethod context,
ProgramMethod method,
AppView<?> appView,
- ValueNumberGenerator valueNumberGenerator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
diff --git a/src/main/java/com/android/tools/r8/graph/LazyCfCode.java b/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
index 6c93947..b0e0312 100644
--- a/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
+++ b/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
@@ -54,8 +54,8 @@
import com.android.tools.r8.ir.code.If;
import com.android.tools.r8.ir.code.MemberType;
import com.android.tools.r8.ir.code.Monitor;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.Position;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.code.ValueType;
import com.android.tools.r8.ir.conversion.MethodProcessor;
import com.android.tools.r8.naming.ClassNameMapper;
@@ -218,7 +218,7 @@
ProgramMethod context,
ProgramMethod method,
AppView<?> appView,
- ValueNumberGenerator valueNumberGenerator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
diff --git a/src/main/java/com/android/tools/r8/graph/ProgramMethod.java b/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
index 88c781c..6ff5f1d 100644
--- a/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
@@ -4,8 +4,8 @@
package com.android.tools.r8.graph;
import com.android.tools.r8.ir.code.IRCode;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.Position;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.conversion.MethodProcessor;
import com.android.tools.r8.logging.Log;
import com.android.tools.r8.origin.Origin;
@@ -25,7 +25,7 @@
public IRCode buildInliningIR(
ProgramMethod context,
AppView<?> appView,
- ValueNumberGenerator valueNumberGenerator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
diff --git a/src/main/java/com/android/tools/r8/ir/code/IRCode.java b/src/main/java/com/android/tools/r8/ir/code/IRCode.java
index 77988b8..476135f 100644
--- a/src/main/java/com/android/tools/r8/ir/code/IRCode.java
+++ b/src/main/java/com/android/tools/r8/ir/code/IRCode.java
@@ -107,8 +107,8 @@
private final ProgramMethod method;
public LinkedList<BasicBlock> blocks;
- public final ValueNumberGenerator valueNumberGenerator;
- public final ValueNumberGenerator basicBlockNumberGenerator;
+ public final NumberGenerator valueNumberGenerator;
+ public final NumberGenerator basicBlockNumberGenerator;
private int usedMarkingColors = 0;
private boolean numbered = false;
@@ -127,8 +127,8 @@
InternalOptions options,
ProgramMethod method,
LinkedList<BasicBlock> blocks,
- ValueNumberGenerator valueNumberGenerator,
- ValueNumberGenerator basicBlockNumberGenerator,
+ NumberGenerator valueNumberGenerator,
+ NumberGenerator basicBlockNumberGenerator,
IRMetadata metadata,
Origin origin) {
assert metadata != null;
diff --git a/src/main/java/com/android/tools/r8/ir/code/ValueNumberGenerator.java b/src/main/java/com/android/tools/r8/ir/code/NumberGenerator.java
similarity index 91%
rename from src/main/java/com/android/tools/r8/ir/code/ValueNumberGenerator.java
rename to src/main/java/com/android/tools/r8/ir/code/NumberGenerator.java
index 722f30e..5b01dfa 100644
--- a/src/main/java/com/android/tools/r8/ir/code/ValueNumberGenerator.java
+++ b/src/main/java/com/android/tools/r8/ir/code/NumberGenerator.java
@@ -3,7 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.ir.code;
-public class ValueNumberGenerator {
+public class NumberGenerator {
private int nextValueNumber = 0;
public int next() {
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
index c36eb8e..6b7b402 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
@@ -92,6 +92,7 @@
import com.android.tools.r8.ir.code.NewInstance;
import com.android.tools.r8.ir.code.Not;
import com.android.tools.r8.ir.code.NumberConversion;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.NumericType;
import com.android.tools.r8.ir.code.Or;
import com.android.tools.r8.ir.code.Phi;
@@ -107,7 +108,6 @@
import com.android.tools.r8.ir.code.Throw;
import com.android.tools.r8.ir.code.Ushr;
import com.android.tools.r8.ir.code.Value;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.code.ValueType;
import com.android.tools.r8.ir.code.ValueTypeConstraint;
import com.android.tools.r8.ir.code.Xor;
@@ -391,8 +391,8 @@
private BasicBlock currentBlock = null;
private int currentInstructionOffset = -1;
- final private ValueNumberGenerator valueNumberGenerator;
- private final ValueNumberGenerator basicBlockNumberGenerator;
+ private final NumberGenerator valueNumberGenerator;
+ private final NumberGenerator basicBlockNumberGenerator;
private final ProgramMethod method;
private ProgramMethod context;
public final AppView<?> appView;
@@ -437,7 +437,7 @@
source,
origin,
lookupPrototypeChanges(appView, method),
- new ValueNumberGenerator());
+ new NumberGenerator());
}
public static IRBuilder createForInlining(
@@ -446,7 +446,7 @@
SourceCode source,
Origin origin,
MethodProcessor processor,
- ValueNumberGenerator valueNumberGenerator) {
+ NumberGenerator valueNumberGenerator) {
RewrittenPrototypeDescription protoChanges =
processor.shouldApplyCodeRewritings(method)
? lookupPrototypeChanges(appView, method)
@@ -475,7 +475,7 @@
SourceCode source,
Origin origin,
RewrittenPrototypeDescription prototypeChanges,
- ValueNumberGenerator valueNumberGenerator) {
+ NumberGenerator valueNumberGenerator) {
assert source != null;
assert valueNumberGenerator != null;
this.method = method;
@@ -484,7 +484,7 @@
this.origin = origin;
this.prototypeChanges = prototypeChanges;
this.valueNumberGenerator = valueNumberGenerator;
- this.basicBlockNumberGenerator = new ValueNumberGenerator();
+ this.basicBlockNumberGenerator = new NumberGenerator();
}
public DexEncodedMethod getMethod() {
@@ -2673,7 +2673,7 @@
return type != NumericType.FLOAT && type != NumericType.DOUBLE && type != NumericType.LONG;
}
- public ValueNumberGenerator getValueNumberGenerator() {
+ public NumberGenerator getValueNumberGenerator() {
return valueNumberGenerator;
}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/inliner/InliningIRProvider.java b/src/main/java/com/android/tools/r8/ir/optimize/inliner/InliningIRProvider.java
index 85cb117..baf75b5 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/inliner/InliningIRProvider.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/inliner/InliningIRProvider.java
@@ -8,8 +8,8 @@
import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.ir.code.IRCode;
import com.android.tools.r8.ir.code.InvokeMethod;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.Position;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.conversion.MethodProcessor;
import com.android.tools.r8.origin.Origin;
import java.util.IdentityHashMap;
@@ -19,7 +19,7 @@
private final AppView<?> appView;
private final ProgramMethod context;
- private final ValueNumberGenerator valueNumberGenerator;
+ private final NumberGenerator valueNumberGenerator;
private final MethodProcessor methodProcessor;
private final Map<InvokeMethod, IRCode> cache = new IdentityHashMap<>();
diff --git a/src/main/java/com/android/tools/r8/ir/synthetic/AbstractSynthesizedCode.java b/src/main/java/com/android/tools/r8/ir/synthetic/AbstractSynthesizedCode.java
index 9402fbb..da4daec 100644
--- a/src/main/java/com/android/tools/r8/ir/synthetic/AbstractSynthesizedCode.java
+++ b/src/main/java/com/android/tools/r8/ir/synthetic/AbstractSynthesizedCode.java
@@ -13,8 +13,8 @@
import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.graph.UseRegistry;
import com.android.tools.r8.ir.code.IRCode;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.Position;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.conversion.IRBuilder;
import com.android.tools.r8.ir.conversion.MethodProcessor;
import com.android.tools.r8.ir.conversion.SourceCode;
@@ -48,7 +48,7 @@
ProgramMethod context,
ProgramMethod method,
AppView<?> appView,
- ValueNumberGenerator valueNumberGenerator,
+ NumberGenerator valueNumberGenerator,
Position callerPosition,
Origin origin,
MethodProcessor methodProcessor) {
diff --git a/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java b/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java
index 83f64ee..a031cf8 100644
--- a/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java
@@ -12,7 +12,7 @@
import com.android.tools.r8.ir.code.IRCode;
import com.android.tools.r8.ir.code.InstructionIterator;
import com.android.tools.r8.ir.code.InstructionListIterator;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.conversion.IRConverter;
import com.android.tools.r8.shaking.MainDexClasses;
import com.android.tools.r8.smali.SmaliBuilder;
@@ -68,7 +68,7 @@
public final List<IRCode> additionalCode;
public final AndroidAppConsumers consumers;
- public final ValueNumberGenerator valueNumberGenerator = new ValueNumberGenerator();
+ public final NumberGenerator valueNumberGenerator = new NumberGenerator();
public TestApplication(AppView<?> appView, MethodSubject method) {
this(appView, method, null);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ConstantRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ConstantRemovalTest.java
index c139dcf..cdb9264 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ConstantRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ConstantRemovalTest.java
@@ -16,11 +16,11 @@
import com.android.tools.r8.ir.code.IRMetadata;
import com.android.tools.r8.ir.code.Instruction;
import com.android.tools.r8.ir.code.Move;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.NumericType;
import com.android.tools.r8.ir.code.Position;
import com.android.tools.r8.ir.code.Return;
import com.android.tools.r8.ir.code.Value;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator;
import com.android.tools.r8.ir.regalloc.LiveIntervals;
import com.android.tools.r8.origin.Origin;
@@ -70,7 +70,7 @@
//
// Then test that peephole optimization realizes that the last const number
// is needed and the value 10 is *not* still in register 0 at that point.
- final ValueNumberGenerator basicBlockNumberGenerator = new ValueNumberGenerator();
+ final NumberGenerator basicBlockNumberGenerator = new NumberGenerator();
BasicBlock block = new BasicBlock();
block.setNumber(basicBlockNumberGenerator.next());
@@ -141,7 +141,7 @@
options,
null,
blocks,
- new ValueNumberGenerator(),
+ new NumberGenerator(),
basicBlockNumberGenerator,
IRMetadata.unknown(),
Origin.unknown());
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/TrivialGotoEliminationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/TrivialGotoEliminationTest.java
index 69394e0..9fc16f8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/TrivialGotoEliminationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/TrivialGotoEliminationTest.java
@@ -22,11 +22,11 @@
import com.android.tools.r8.ir.code.If;
import com.android.tools.r8.ir.code.If.Type;
import com.android.tools.r8.ir.code.Instruction;
+import com.android.tools.r8.ir.code.NumberGenerator;
import com.android.tools.r8.ir.code.Position;
import com.android.tools.r8.ir.code.Return;
import com.android.tools.r8.ir.code.Throw;
import com.android.tools.r8.ir.code.Value;
-import com.android.tools.r8.ir.code.ValueNumberGenerator;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.InternalOptions;
@@ -62,7 +62,7 @@
// throw v0
// block2:
// return
- final ValueNumberGenerator basicBlockNumberGenerator = new ValueNumberGenerator();
+ final NumberGenerator basicBlockNumberGenerator = new NumberGenerator();
Position position = Position.testingPosition();
BasicBlock block2 = new BasicBlock();
BasicBlock block0 =
@@ -98,7 +98,7 @@
options,
null,
blocks,
- new ValueNumberGenerator(),
+ new NumberGenerator(),
basicBlockNumberGenerator,
IRMetadata.unknown(),
Origin.unknown());
@@ -126,7 +126,7 @@
//
// block3:
// goto block3
- final ValueNumberGenerator basicBlockNumberGenerator = new ValueNumberGenerator();
+ final NumberGenerator basicBlockNumberGenerator = new NumberGenerator();
Position position = Position.testingPosition();
BasicBlock block0 = new BasicBlock();
block0.setNumber(basicBlockNumberGenerator.next());
@@ -185,7 +185,7 @@
options,
null,
blocks,
- new ValueNumberGenerator(),
+ new NumberGenerator(),
basicBlockNumberGenerator,
IRMetadata.unknown(),
Origin.unknown());
