Update use of RootSet in tests
Change-Id: Iadbb255cf410cde13d4bca2ed2276ca4d777f199
diff --git a/src/test/java/com/android/tools/r8/ir/InlineTest.java b/src/test/java/com/android/tools/r8/ir/InlineTest.java
index 8e99382..97c7b0a 100644
--- a/src/test/java/com/android/tools/r8/ir/InlineTest.java
+++ b/src/test/java/com/android/tools/r8/ir/InlineTest.java
@@ -18,7 +18,6 @@
import com.android.tools.r8.shaking.ProguardClassFilter;
import com.android.tools.r8.shaking.ProguardKeepRule;
import com.android.tools.r8.shaking.RootSetBuilder;
-import com.android.tools.r8.shaking.RootSetBuilder.RootSet;
import com.android.tools.r8.smali.SmaliBuilder;
import com.android.tools.r8.smali.SmaliBuilder.MethodSignature;
import com.android.tools.r8.utils.InternalOptions;
@@ -46,18 +45,18 @@
AppView.createForR8(new AppInfoWithSubtyping(application), options);
appView.setAppServices(AppServices.builder(appView).build());
ExecutorService executorService = ThreadUtils.getExecutorService(options);
- RootSet rootSet =
+ appView.setRootSet(
new RootSetBuilder(
appView,
application,
ImmutableList.of(ProguardKeepRule.defaultKeepAllRule(unused -> {})))
- .run(executorService);
+ .run(executorService));
Timing timing = new Timing(getClass().getSimpleName());
Enqueuer enqueuer = new Enqueuer(appView, options, null);
appView.setAppInfo(
- enqueuer.traceApplication(rootSet, ProguardClassFilter.empty(), executorService, timing));
-
- return new TestApplication(appView, rootSet, method, additionalCode);
+ enqueuer.traceApplication(
+ appView.rootSet(), ProguardClassFilter.empty(), executorService, timing));
+ return new TestApplication(appView, method, additionalCode);
}
private TestApplication codeForMethodReplaceTest(int a, int b) throws ExecutionException {
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 1ba8700..0e1540d 100644
--- a/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java
@@ -17,7 +17,6 @@
import com.android.tools.r8.ir.conversion.IRConverter;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.shaking.MainDexClasses;
-import com.android.tools.r8.shaking.RootSetBuilder.RootSet;
import com.android.tools.r8.smali.SmaliBuilder;
import com.android.tools.r8.smali.SmaliBuilder.MethodSignature;
import com.android.tools.r8.smali.SmaliTestBase;
@@ -77,7 +76,6 @@
public final DexApplication application;
public final AppView<? extends AppInfo> appView;
- public final RootSet rootSet;
public final DexEncodedMethod method;
public final IRCode code;
@@ -87,17 +85,15 @@
public final ValueNumberGenerator valueNumberGenerator = new ValueNumberGenerator();
public TestApplication(AppView<? extends AppInfo> appView, MethodSubject method) {
- this(appView, null, method, null);
+ this(appView, method, null);
}
public TestApplication(
AppView<? extends AppInfo> appView,
- RootSet rootSet,
MethodSubject method,
List<IRCode> additionalCode) {
this.application = appView.appInfo().app();
this.appView = appView;
- this.rootSet = rootSet;
this.method = method.getMethod();
this.code = method.buildIR(appView.dexItemFactory());
this.additionalCode = additionalCode;
@@ -133,7 +129,7 @@
public String run() throws IOException {
Timing timing = new Timing(getClass().getSimpleName());
- IRConverter converter = new IRConverter(appView, timing, null, MainDexClasses.NONE, rootSet);
+ IRConverter converter = new IRConverter(appView, timing, null, MainDexClasses.NONE);
converter.replaceCodeForTesting(method, code);
AndroidApp app = writeDex(application, appView.options());
return runOnArtRaw(app, DEFAULT_MAIN_CLASS_NAME).stdout;
