Remove unneeded MethodProcessor#createMethodProcessingContext
Change-Id: I47a0517047b8f7eb63fb42741bd531b9d59c4c5b
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/D8MethodProcessor.java b/src/main/java/com/android/tools/r8/ir/conversion/D8MethodProcessor.java
index 4e778ae..2229d90 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/D8MethodProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/D8MethodProcessor.java
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.ir.conversion;
-import com.android.tools.r8.contexts.CompilationContext.MethodProcessingContext;
import com.android.tools.r8.contexts.CompilationContext.ProcessorContext;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.DexProgramClass;
@@ -63,11 +62,6 @@
this.processorContext = converter.appView.createProcessorContext();
}
- @Override
- public MethodProcessingContext createMethodProcessingContext(ProgramMethod method) {
- return processorContext.createMethodProcessingContext(method);
- }
-
public ProfileCollectionAdditions getProfileCollectionAdditions() {
return profileCollectionAdditions;
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/MethodProcessor.java b/src/main/java/com/android/tools/r8/ir/conversion/MethodProcessor.java
index ae28180..975a893 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/MethodProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/MethodProcessor.java
@@ -21,8 +21,6 @@
return false;
}
- public abstract MethodProcessingContext createMethodProcessingContext(ProgramMethod method);
-
public abstract MethodProcessorEventConsumer getEventConsumer();
public abstract boolean isProcessedConcurrently(ProgramMethod method);
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/OneTimeMethodProcessor.java b/src/main/java/com/android/tools/r8/ir/conversion/OneTimeMethodProcessor.java
index 86a4feb..3a1d213 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/OneTimeMethodProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/OneTimeMethodProcessor.java
@@ -65,11 +65,6 @@
}
@Override
- public MethodProcessingContext createMethodProcessingContext(ProgramMethod method) {
- return processorContext.createMethodProcessingContext(method);
- }
-
- @Override
public MethodProcessorEventConsumer getEventConsumer() {
return eventConsumer;
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/PostMethodProcessor.java b/src/main/java/com/android/tools/r8/ir/conversion/PostMethodProcessor.java
index 893db6c..cf04a02 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/PostMethodProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/PostMethodProcessor.java
@@ -6,7 +6,6 @@
import static com.android.tools.r8.graph.DexProgramClass.asProgramClassOrNull;
-import com.android.tools.r8.contexts.CompilationContext.MethodProcessingContext;
import com.android.tools.r8.contexts.CompilationContext.ProcessorContext;
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DexEncodedMethod;
@@ -50,11 +49,6 @@
}
@Override
- public MethodProcessingContext createMethodProcessingContext(ProgramMethod method) {
- return processorContext.createMethodProcessingContext(method);
- }
-
- @Override
public MethodProcessorEventConsumer getEventConsumer() {
return eventConsumer;
}
@@ -193,7 +187,9 @@
ThreadUtils.processItemsWithResults(
wave,
method -> {
- Timing time = consumer.apply(method, createMethodProcessingContext(method));
+ Timing time =
+ consumer.apply(
+ method, processorContext.createMethodProcessingContext(method));
time.end();
return time;
},
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/PrimaryMethodProcessor.java b/src/main/java/com/android/tools/r8/ir/conversion/PrimaryMethodProcessor.java
index fb136e1..51e38b0 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/PrimaryMethodProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/PrimaryMethodProcessor.java
@@ -68,11 +68,6 @@
}
@Override
- public MethodProcessingContext createMethodProcessingContext(ProgramMethod method) {
- return processorContext.createMethodProcessingContext(method);
- }
-
- @Override
public MethodProcessorEventConsumer getEventConsumer() {
return eventConsumer;
}
@@ -142,7 +137,9 @@
ThreadUtils.processItemsWithResults(
wave,
method -> {
- Timing time = consumer.apply(method, createMethodProcessingContext(method));
+ Timing time =
+ consumer.apply(
+ method, processorContext.createMethodProcessingContext(method));
time.end();
return time;
},
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldBitAccessInfoTest.java b/src/test/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldBitAccessInfoTest.java
index e373513..ea825ed 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldBitAccessInfoTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldBitAccessInfoTest.java
@@ -15,7 +15,6 @@
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.contexts.CompilationContext.MethodProcessingContext;
import com.android.tools.r8.dex.ApplicationReader;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.AppInfoWithClassHierarchy;
@@ -217,11 +216,6 @@
static class PrimaryMethodProcessorMock extends MethodProcessorWithWave {
@Override
- public MethodProcessingContext createMethodProcessingContext(ProgramMethod method) {
- throw new Unreachable();
- }
-
- @Override
public MethodProcessorEventConsumer getEventConsumer() {
throw new Unreachable();
}
