Rename MissingDefinitionContext to DefinitionContext
Change-Id: I0e2d3b6e72e4b5ae5547fbfd7f869b997a0fb699
diff --git a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionClassContext.java b/src/main/java/com/android/tools/r8/diagnostic/DefinitionClassContext.java
similarity index 79%
rename from src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionClassContext.java
rename to src/main/java/com/android/tools/r8/diagnostic/DefinitionClassContext.java
index 1b73b9f..e1530bf 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionClassContext.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/DefinitionClassContext.java
@@ -8,7 +8,7 @@
import com.android.tools.r8.references.ClassReference;
@Keep
-public interface MissingDefinitionClassContext extends MissingDefinitionContext {
+public interface DefinitionClassContext extends DefinitionContext {
/** Returns the reference of the class context. */
ClassReference getClassReference();
@@ -19,7 +19,7 @@
}
@Override
- default MissingDefinitionClassContext asClassContext() {
+ default DefinitionClassContext asClassContext() {
return this;
}
}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/DefinitionContext.java b/src/main/java/com/android/tools/r8/diagnostic/DefinitionContext.java
new file mode 100644
index 0000000..d05e123
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/diagnostic/DefinitionContext.java
@@ -0,0 +1,61 @@
+// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.diagnostic;
+
+import com.android.tools.r8.Keep;
+import com.android.tools.r8.origin.Origin;
+
+/** A context that references a missing definition in the program, classpath, or library. */
+@Keep
+public interface DefinitionContext {
+
+ /** The origin of the context. */
+ Origin getOrigin();
+
+ /** Predicate that is true iff this is an instance of {@link DefinitionClassContext}. */
+ default boolean isClassContext() {
+ return false;
+ }
+
+ /** Predicate that is true iff this is an instance of {@link DefinitionFieldContext}. */
+ default boolean isFieldContext() {
+ return false;
+ }
+
+ /** Predicate that is true iff this is an instance of {@link DefinitionMethodContext}. */
+ default boolean isMethodContext() {
+ return false;
+ }
+
+ /**
+ * Return a non-null {@link DefinitionClassContext} if this type is {@link
+ * DefinitionClassContext}.
+ *
+ * @return this with static type of {@link DefinitionClassContext}.
+ */
+ default DefinitionClassContext asClassContext() {
+ return null;
+ }
+
+ /**
+ * Return a non-null {@link DefinitionFieldContext} if this type is {@link
+ * DefinitionFieldContext}.
+ *
+ * @return this with static type of {@link DefinitionFieldContext}.
+ */
+ default DefinitionFieldContext asFieldContext() {
+ return null;
+ }
+
+ /**
+ * Return a non-null {@link DefinitionMethodContext} if this type is {@link
+ * DefinitionMethodContext}.
+ *
+ * @return this with static type of {@link DefinitionMethodContext}.
+ */
+ default DefinitionMethodContext asMethodContext() {
+ return null;
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionFieldContext.java b/src/main/java/com/android/tools/r8/diagnostic/DefinitionFieldContext.java
similarity index 79%
rename from src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionFieldContext.java
rename to src/main/java/com/android/tools/r8/diagnostic/DefinitionFieldContext.java
index 7564f5a..b3c4981 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionFieldContext.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/DefinitionFieldContext.java
@@ -8,7 +8,7 @@
import com.android.tools.r8.references.FieldReference;
@Keep
-public interface MissingDefinitionFieldContext extends MissingDefinitionContext {
+public interface DefinitionFieldContext extends DefinitionContext {
/** Returns the reference of the field context. */
FieldReference getFieldReference();
@@ -19,7 +19,7 @@
}
@Override
- default MissingDefinitionFieldContext asFieldContext() {
+ default DefinitionFieldContext asFieldContext() {
return this;
}
}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionMethodContext.java b/src/main/java/com/android/tools/r8/diagnostic/DefinitionMethodContext.java
similarity index 79%
rename from src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionMethodContext.java
rename to src/main/java/com/android/tools/r8/diagnostic/DefinitionMethodContext.java
index 315a29c..86742db 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionMethodContext.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/DefinitionMethodContext.java
@@ -8,7 +8,7 @@
import com.android.tools.r8.references.MethodReference;
@Keep
-public interface MissingDefinitionMethodContext extends MissingDefinitionContext {
+public interface DefinitionMethodContext extends DefinitionContext {
/** Returns the reference of the method context. */
MethodReference getMethodReference();
@@ -19,7 +19,7 @@
}
@Override
- default MissingDefinitionMethodContext asMethodContext() {
+ default DefinitionMethodContext asMethodContext() {
return this;
}
}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionContext.java b/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionContext.java
deleted file mode 100644
index cb5d3b4..0000000
--- a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionContext.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-package com.android.tools.r8.diagnostic;
-
-import com.android.tools.r8.Keep;
-import com.android.tools.r8.origin.Origin;
-
-/** A context that references a missing definition in the program, classpath, or library. */
-@Keep
-public interface MissingDefinitionContext {
-
- /** The origin of the context. */
- Origin getOrigin();
-
- /** Predicate that is true iff this is an instance of {@link MissingDefinitionClassContext}. */
- default boolean isClassContext() {
- return false;
- }
-
- /** Predicate that is true iff this is an instance of {@link MissingDefinitionFieldContext}. */
- default boolean isFieldContext() {
- return false;
- }
-
- /** Predicate that is true iff this is an instance of {@link MissingDefinitionMethodContext}. */
- default boolean isMethodContext() {
- return false;
- }
-
- /**
- * Return a non-null {@link MissingDefinitionClassContext} if this type is {@link
- * MissingDefinitionClassContext}.
- *
- * @return this with static type of {@link MissingDefinitionClassContext}.
- */
- default MissingDefinitionClassContext asClassContext() {
- return null;
- }
-
- /**
- * Return a non-null {@link MissingDefinitionFieldContext} if this type is {@link
- * MissingDefinitionFieldContext}.
- *
- * @return this with static type of {@link MissingDefinitionFieldContext}.
- */
- default MissingDefinitionFieldContext asFieldContext() {
- return null;
- }
-
- /**
- * Return a non-null {@link MissingDefinitionMethodContext} if this type is {@link
- * MissingDefinitionMethodContext}.
- *
- * @return this with static type of {@link MissingDefinitionMethodContext}.
- */
- default MissingDefinitionMethodContext asMethodContext() {
- return null;
- }
-}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionInfo.java b/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionInfo.java
index ec486de..03fe322 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionInfo.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/MissingDefinitionInfo.java
@@ -68,5 +68,5 @@
String getDiagnosticMessage();
/** The contexts from which this missing definition was referenced. */
- Collection<MissingDefinitionContext> getReferencedFromContexts();
+ Collection<DefinitionContext> getReferencedFromContexts();
}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionClassContextImpl.java b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionClassContextImpl.java
similarity index 68%
rename from src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionClassContextImpl.java
rename to src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionClassContextImpl.java
index 7944a1e..b632519 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionClassContextImpl.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionClassContextImpl.java
@@ -4,16 +4,16 @@
package com.android.tools.r8.diagnostic.internal;
-import com.android.tools.r8.diagnostic.MissingDefinitionClassContext;
+import com.android.tools.r8.diagnostic.DefinitionClassContext;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.references.ClassReference;
-public class MissingDefinitionClassContextImpl extends MissingDefinitionContextBase
- implements MissingDefinitionClassContext {
+public class DefinitionClassContextImpl extends DefinitionContextBase
+ implements DefinitionClassContext {
private final ClassReference classReference;
- private MissingDefinitionClassContextImpl(ClassReference classReference, Origin origin) {
+ private DefinitionClassContextImpl(ClassReference classReference, Origin origin) {
super(origin);
this.classReference = classReference;
}
@@ -27,7 +27,7 @@
return classReference;
}
- public static class Builder extends MissingDefinitionContextBase.Builder<Builder> {
+ public static class Builder extends DefinitionContextBase.Builder<Builder> {
private ClassReference classReference;
@@ -44,9 +44,9 @@
}
@Override
- public MissingDefinitionClassContextImpl build() {
+ public DefinitionClassContextImpl build() {
assert validate();
- return new MissingDefinitionClassContextImpl(classReference, origin);
+ return new DefinitionClassContextImpl(classReference, origin);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionContextBase.java b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionContextBase.java
similarity index 74%
rename from src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionContextBase.java
rename to src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionContextBase.java
index cf6a0d1..44bd042 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionContextBase.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionContextBase.java
@@ -4,14 +4,14 @@
package com.android.tools.r8.diagnostic.internal;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
+import com.android.tools.r8.diagnostic.DefinitionContext;
import com.android.tools.r8.origin.Origin;
-public abstract class MissingDefinitionContextBase implements MissingDefinitionContext {
+public abstract class DefinitionContextBase implements DefinitionContext {
private final Origin origin;
- MissingDefinitionContextBase(Origin origin) {
+ DefinitionContextBase(Origin origin) {
this.origin = origin;
}
@@ -31,7 +31,7 @@
abstract B self();
- public abstract MissingDefinitionContext build();
+ public abstract DefinitionContext build();
public boolean validate() {
assert origin != null;
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionContextUtils.java b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionContextUtils.java
new file mode 100644
index 0000000..1703738
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionContextUtils.java
@@ -0,0 +1,79 @@
+// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.diagnostic.internal;
+
+import com.android.tools.r8.diagnostic.DefinitionClassContext;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.DefinitionFieldContext;
+import com.android.tools.r8.diagnostic.DefinitionMethodContext;
+import com.android.tools.r8.errors.Unreachable;
+import com.android.tools.r8.graph.Definition;
+import com.android.tools.r8.graph.ProgramDerivedContext;
+import com.android.tools.r8.utils.FieldReferenceUtils;
+import com.android.tools.r8.utils.MethodReferenceUtils;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class DefinitionContextUtils {
+
+ public static void accept(
+ DefinitionContext definitionContext,
+ Consumer<DefinitionClassContext> definitionClassContextConsumer,
+ Consumer<DefinitionFieldContext> definitionFieldContextConsumer,
+ Consumer<DefinitionMethodContext> definitionMethodContextConsumer) {
+ if (definitionContext.isClassContext()) {
+ definitionClassContextConsumer.accept(definitionContext.asClassContext());
+ } else if (definitionContext.isFieldContext()) {
+ definitionFieldContextConsumer.accept(definitionContext.asFieldContext());
+ } else {
+ assert definitionContext.isMethodContext();
+ definitionMethodContextConsumer.accept(definitionContext.asMethodContext());
+ }
+ }
+
+ public static <T> T apply(
+ DefinitionContext definitionContext,
+ Function<DefinitionClassContext, T> definitionClassContextFn,
+ Function<DefinitionFieldContext, T> definitionFieldContextFn,
+ Function<DefinitionMethodContext, T> definitionMethodContextFn) {
+ if (definitionContext.isClassContext()) {
+ return definitionClassContextFn.apply(definitionContext.asClassContext());
+ } else if (definitionContext.isFieldContext()) {
+ return definitionFieldContextFn.apply(definitionContext.asFieldContext());
+ } else {
+ assert definitionContext.isMethodContext();
+ return definitionMethodContextFn.apply(definitionContext.asMethodContext());
+ }
+ }
+
+ public static DefinitionContext create(ProgramDerivedContext programDerivedContext) {
+ Definition context = programDerivedContext.getContext();
+ DefinitionContextBase.Builder<?> builder;
+ if (context.isClass()) {
+ builder =
+ DefinitionClassContextImpl.builder()
+ .setClassContext(context.asClass().getClassReference());
+ } else if (context.isField()) {
+ builder =
+ DefinitionFieldContextImpl.builder()
+ .setFieldContext(context.asField().getFieldReference());
+ } else if (context.isMethod()) {
+ builder =
+ DefinitionMethodContextImpl.builder()
+ .setMethodContext(context.asMethod().getMethodReference());
+ } else {
+ throw new Unreachable();
+ }
+ return builder.setOrigin(context.getOrigin()).build();
+ }
+
+ public static String toSourceString(DefinitionContext definitionContext) {
+ return DefinitionContextUtils.apply(
+ definitionContext,
+ classContext -> classContext.getClassReference().getTypeName(),
+ fieldContext -> FieldReferenceUtils.toSourceString(fieldContext.getFieldReference()),
+ methodContext -> MethodReferenceUtils.toSourceString(methodContext.getMethodReference()));
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionFieldContextImpl.java b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionFieldContextImpl.java
similarity index 68%
rename from src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionFieldContextImpl.java
rename to src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionFieldContextImpl.java
index b9ecf41..888f401 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionFieldContextImpl.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionFieldContextImpl.java
@@ -4,16 +4,16 @@
package com.android.tools.r8.diagnostic.internal;
-import com.android.tools.r8.diagnostic.MissingDefinitionFieldContext;
+import com.android.tools.r8.diagnostic.DefinitionFieldContext;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.references.FieldReference;
-public class MissingDefinitionFieldContextImpl extends MissingDefinitionContextBase
- implements MissingDefinitionFieldContext {
+public class DefinitionFieldContextImpl extends DefinitionContextBase
+ implements DefinitionFieldContext {
private final FieldReference fieldReference;
- private MissingDefinitionFieldContextImpl(FieldReference fieldReference, Origin origin) {
+ private DefinitionFieldContextImpl(FieldReference fieldReference, Origin origin) {
super(origin);
this.fieldReference = fieldReference;
}
@@ -27,7 +27,7 @@
return fieldReference;
}
- public static class Builder extends MissingDefinitionContextBase.Builder<Builder> {
+ public static class Builder extends DefinitionContextBase.Builder<Builder> {
private FieldReference fieldReference;
@@ -44,9 +44,9 @@
}
@Override
- public MissingDefinitionFieldContextImpl build() {
+ public DefinitionFieldContextImpl build() {
assert validate();
- return new MissingDefinitionFieldContextImpl(fieldReference, origin);
+ return new DefinitionFieldContextImpl(fieldReference, origin);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionMethodContextImpl.java b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionMethodContextImpl.java
similarity index 68%
rename from src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionMethodContextImpl.java
rename to src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionMethodContextImpl.java
index eba8719..5c35d3b 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionMethodContextImpl.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/DefinitionMethodContextImpl.java
@@ -4,16 +4,16 @@
package com.android.tools.r8.diagnostic.internal;
-import com.android.tools.r8.diagnostic.MissingDefinitionMethodContext;
+import com.android.tools.r8.diagnostic.DefinitionMethodContext;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.references.MethodReference;
-public class MissingDefinitionMethodContextImpl extends MissingDefinitionContextBase
- implements MissingDefinitionMethodContext {
+public class DefinitionMethodContextImpl extends DefinitionContextBase
+ implements DefinitionMethodContext {
private final MethodReference methodReference;
- private MissingDefinitionMethodContextImpl(MethodReference methodReference, Origin origin) {
+ private DefinitionMethodContextImpl(MethodReference methodReference, Origin origin) {
super(origin);
this.methodReference = methodReference;
}
@@ -27,7 +27,7 @@
return methodReference;
}
- public static class Builder extends MissingDefinitionContextBase.Builder<Builder> {
+ public static class Builder extends DefinitionContextBase.Builder<Builder> {
private MethodReference methodReference;
@@ -44,9 +44,9 @@
}
@Override
- public MissingDefinitionMethodContextImpl build() {
+ public DefinitionMethodContextImpl build() {
assert validate();
- return new MissingDefinitionMethodContextImpl(methodReference, origin);
+ return new DefinitionMethodContextImpl(methodReference, origin);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingClassInfoImpl.java b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingClassInfoImpl.java
index b240279..82d5a35 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingClassInfoImpl.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingClassInfoImpl.java
@@ -4,8 +4,8 @@
package com.android.tools.r8.diagnostic.internal;
+import com.android.tools.r8.diagnostic.DefinitionContext;
import com.android.tools.r8.diagnostic.MissingClassInfo;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
import com.android.tools.r8.diagnostic.MissingDefinitionInfo;
import com.android.tools.r8.references.ClassReference;
import java.util.Collection;
@@ -15,7 +15,7 @@
private final ClassReference classReference;
private MissingClassInfoImpl(
- ClassReference classReference, Collection<MissingDefinitionContext> referencedFromContexts) {
+ ClassReference classReference, Collection<DefinitionContext> referencedFromContexts) {
super(referencedFromContexts);
this.classReference = classReference;
}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionContextUtils.java b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionContextUtils.java
deleted file mode 100644
index 74b48c5..0000000
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionContextUtils.java
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-package com.android.tools.r8.diagnostic.internal;
-
-import com.android.tools.r8.diagnostic.MissingDefinitionClassContext;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.MissingDefinitionFieldContext;
-import com.android.tools.r8.diagnostic.MissingDefinitionMethodContext;
-import com.android.tools.r8.errors.Unreachable;
-import com.android.tools.r8.graph.Definition;
-import com.android.tools.r8.graph.ProgramDerivedContext;
-import com.android.tools.r8.utils.FieldReferenceUtils;
-import com.android.tools.r8.utils.MethodReferenceUtils;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-public class MissingDefinitionContextUtils {
-
- public static void accept(
- MissingDefinitionContext missingDefinitionContext,
- Consumer<MissingDefinitionClassContext> missingDefinitionClassContextConsumer,
- Consumer<MissingDefinitionFieldContext> missingDefinitionFieldContextConsumer,
- Consumer<MissingDefinitionMethodContext> missingDefinitionMethodContextConsumer) {
- if (missingDefinitionContext.isClassContext()) {
- missingDefinitionClassContextConsumer.accept(missingDefinitionContext.asClassContext());
- } else if (missingDefinitionContext.isFieldContext()) {
- missingDefinitionFieldContextConsumer.accept(missingDefinitionContext.asFieldContext());
- } else {
- assert missingDefinitionContext.isMethodContext();
- missingDefinitionMethodContextConsumer.accept(missingDefinitionContext.asMethodContext());
- }
- }
-
- public static <T> T apply(
- MissingDefinitionContext missingDefinitionContext,
- Function<MissingDefinitionClassContext, T> missingDefinitionClassContextFn,
- Function<MissingDefinitionFieldContext, T> missingDefinitionFieldContextFn,
- Function<MissingDefinitionMethodContext, T> missingDefinitionMethodContextFn) {
- if (missingDefinitionContext.isClassContext()) {
- return missingDefinitionClassContextFn.apply(missingDefinitionContext.asClassContext());
- } else if (missingDefinitionContext.isFieldContext()) {
- return missingDefinitionFieldContextFn.apply(missingDefinitionContext.asFieldContext());
- } else {
- assert missingDefinitionContext.isMethodContext();
- return missingDefinitionMethodContextFn.apply(missingDefinitionContext.asMethodContext());
- }
- }
-
- public static MissingDefinitionContext create(ProgramDerivedContext programDerivedContext) {
- Definition context = programDerivedContext.getContext();
- MissingDefinitionContextBase.Builder<?> builder;
- if (context.isClass()) {
- builder =
- MissingDefinitionClassContextImpl.builder()
- .setClassContext(context.asClass().getClassReference());
- } else if (context.isField()) {
- builder =
- MissingDefinitionFieldContextImpl.builder()
- .setFieldContext(context.asField().getFieldReference());
- } else if (context.isMethod()) {
- builder =
- MissingDefinitionMethodContextImpl.builder()
- .setMethodContext(context.asMethod().getMethodReference());
- } else {
- throw new Unreachable();
- }
- return builder.setOrigin(context.getOrigin()).build();
- }
-
- public static String toSourceString(MissingDefinitionContext missingDefinitionContext) {
- return MissingDefinitionContextUtils.apply(
- missingDefinitionContext,
- classContext -> classContext.getClassReference().getTypeName(),
- fieldContext -> FieldReferenceUtils.toSourceString(fieldContext.getFieldReference()),
- methodContext -> MethodReferenceUtils.toSourceString(methodContext.getMethodReference()));
- }
-}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionInfoBase.java b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionInfoBase.java
index b3d2872..8d90a92 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionInfoBase.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionInfoBase.java
@@ -4,16 +4,16 @@
package com.android.tools.r8.diagnostic.internal;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
+import com.android.tools.r8.diagnostic.DefinitionContext;
import com.android.tools.r8.diagnostic.MissingDefinitionInfo;
import com.google.common.collect.ImmutableList;
import java.util.Collection;
public abstract class MissingDefinitionInfoBase implements MissingDefinitionInfo {
- final Collection<MissingDefinitionContext> referencedFromContexts;
+ final Collection<DefinitionContext> referencedFromContexts;
- MissingDefinitionInfoBase(Collection<MissingDefinitionContext> referencedFromContexts) {
+ MissingDefinitionInfoBase(Collection<DefinitionContext> referencedFromContexts) {
this.referencedFromContexts = referencedFromContexts;
}
@@ -25,18 +25,18 @@
}
@Override
- public final Collection<MissingDefinitionContext> getReferencedFromContexts() {
+ public final Collection<DefinitionContext> getReferencedFromContexts() {
return referencedFromContexts;
}
public abstract static class Builder {
- final ImmutableList.Builder<MissingDefinitionContext> referencedFromContextsBuilder =
+ final ImmutableList.Builder<DefinitionContext> referencedFromContextsBuilder =
ImmutableList.builder();
Builder() {}
- public Builder addReferencedFromContext(MissingDefinitionContext missingDefinitionContext) {
+ public Builder addReferencedFromContext(DefinitionContext missingDefinitionContext) {
referencedFromContextsBuilder.add(missingDefinitionContext);
return this;
}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionInfoUtils.java b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionInfoUtils.java
index 224b2a4..a744297 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionInfoUtils.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingDefinitionInfoUtils.java
@@ -8,8 +8,8 @@
import static com.android.tools.r8.utils.FieldReferenceUtils.getFieldReferenceComparator;
import static com.android.tools.r8.utils.MethodReferenceUtils.getMethodReferenceComparator;
+import com.android.tools.r8.diagnostic.DefinitionContext;
import com.android.tools.r8.diagnostic.MissingClassInfo;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
import com.android.tools.r8.diagnostic.MissingDefinitionInfo;
import com.android.tools.r8.diagnostic.MissingFieldInfo;
import com.android.tools.r8.diagnostic.MissingMethodInfo;
@@ -110,9 +110,9 @@
Box<ClassReference> classContext = new Box<>();
Box<FieldReference> fieldContext = new Box<>();
Box<MethodReference> methodContext = new Box<>();
- for (MissingDefinitionContext missingDefinitionContext :
+ for (DefinitionContext missingDefinitionContext :
missingDefinitionInfo.getReferencedFromContexts()) {
- MissingDefinitionContextUtils.accept(
+ DefinitionContextUtils.accept(
missingDefinitionContext,
missingDefinitionClassContext ->
classContext.setMin(
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingFieldInfoImpl.java b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingFieldInfoImpl.java
index 216080d..d7acc21 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingFieldInfoImpl.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingFieldInfoImpl.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.diagnostic.internal;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
+import com.android.tools.r8.diagnostic.DefinitionContext;
import com.android.tools.r8.diagnostic.MissingDefinitionInfo;
import com.android.tools.r8.diagnostic.MissingFieldInfo;
import com.android.tools.r8.references.FieldReference;
@@ -15,7 +15,7 @@
private final FieldReference fieldReference;
private MissingFieldInfoImpl(
- FieldReference fieldReference, Collection<MissingDefinitionContext> referencedFromContexts) {
+ FieldReference fieldReference, Collection<DefinitionContext> referencedFromContexts) {
super(referencedFromContexts);
this.fieldReference = fieldReference;
}
diff --git a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingMethodInfoImpl.java b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingMethodInfoImpl.java
index 5be14dc..8ab85d9 100644
--- a/src/main/java/com/android/tools/r8/diagnostic/internal/MissingMethodInfoImpl.java
+++ b/src/main/java/com/android/tools/r8/diagnostic/internal/MissingMethodInfoImpl.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.diagnostic.internal;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
+import com.android.tools.r8.diagnostic.DefinitionContext;
import com.android.tools.r8.diagnostic.MissingDefinitionInfo;
import com.android.tools.r8.diagnostic.MissingMethodInfo;
import com.android.tools.r8.references.MethodReference;
@@ -15,8 +15,7 @@
private final MethodReference methodReference;
private MissingMethodInfoImpl(
- MethodReference methodReference,
- Collection<MissingDefinitionContext> referencedFromContexts) {
+ MethodReference methodReference, Collection<DefinitionContext> referencedFromContexts) {
super(referencedFromContexts);
this.methodReference = methodReference;
}
diff --git a/src/main/java/com/android/tools/r8/shaking/MissingClasses.java b/src/main/java/com/android/tools/r8/shaking/MissingClasses.java
index 3e8ad60..0ec8c27 100644
--- a/src/main/java/com/android/tools/r8/shaking/MissingClasses.java
+++ b/src/main/java/com/android/tools/r8/shaking/MissingClasses.java
@@ -9,8 +9,8 @@
import static com.android.tools.r8.utils.collections.IdentityHashSetFromMap.newProgramDerivedContextSet;
import com.android.tools.r8.diagnostic.MissingDefinitionsDiagnostic;
+import com.android.tools.r8.diagnostic.internal.DefinitionContextUtils;
import com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionContextUtils;
import com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl;
import com.android.tools.r8.errors.dontwarn.DontWarnConfiguration;
import com.android.tools.r8.graph.AppView;
@@ -147,7 +147,7 @@
MissingClassInfoImpl.builder().setClass(missingClass.asClassReference());
for (ProgramDerivedContext programDerivedContext : programDerivedContexts) {
missingClassInfoBuilder.addReferencedFromContext(
- MissingDefinitionContextUtils.create(programDerivedContext));
+ DefinitionContextUtils.create(programDerivedContext));
}
diagnosticBuilder.addMissingDefinitionInfo(missingClassInfoBuilder.build());
});
diff --git a/src/main/java/com/android/tools/r8/tracereferences/TraceReferencesCheckConsumer.java b/src/main/java/com/android/tools/r8/tracereferences/TraceReferencesCheckConsumer.java
new file mode 100644
index 0000000..c612faf
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/tracereferences/TraceReferencesCheckConsumer.java
@@ -0,0 +1,44 @@
+// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.tracereferences;
+
+import com.android.tools.r8.DiagnosticsHandler;
+import com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl;
+import com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl;
+import com.android.tools.r8.references.PackageReference;
+
+public class TraceReferencesCheckConsumer implements TraceReferencesConsumer {
+
+ private final MissingDefinitionsDiagnosticImpl.Builder diagnosticBuilder =
+ MissingDefinitionsDiagnosticImpl.builder();
+
+ @Override
+ public void acceptType(TracedClass tracedClass, DiagnosticsHandler handler) {
+ if (tracedClass.isMissingDefinition()) {
+ MissingClassInfoImpl.Builder missingClassInfoBuilder =
+ MissingClassInfoImpl.builder().setClass(tracedClass.getReference());
+ missingClassInfoBuilder.addReferencedFromContext();
+ diagnosticBuilder.addMissingDefinitionInfo(missingClassInfoBuilder.build());
+ }
+ }
+
+ @Override
+ public void acceptField(TracedField tracedField, DiagnosticsHandler handler) {
+ if (tracedField.isMissingDefinition()) {}
+ }
+
+ @Override
+ public void acceptMethod(TracedMethod tracedMethod, DiagnosticsHandler handler) {
+ if (tracedMethod.isMissingDefinition()) {}
+ }
+
+ @Override
+ public void acceptPackage(PackageReference pkg, DiagnosticsHandler handler) {
+ // Intentionally empty.
+ }
+
+ @Override
+ public void finished(DiagnosticsHandler handler) {}
+}
diff --git a/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionContextSubject.java b/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionContextSubject.java
index 4178db4..f058329 100644
--- a/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionContextSubject.java
+++ b/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionContextSubject.java
@@ -7,35 +7,35 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import com.android.tools.r8.diagnostic.MissingDefinitionClassContext;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.MissingDefinitionFieldContext;
-import com.android.tools.r8.diagnostic.MissingDefinitionMethodContext;
+import com.android.tools.r8.diagnostic.DefinitionClassContext;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.DefinitionFieldContext;
+import com.android.tools.r8.diagnostic.DefinitionMethodContext;
public class FoundMissingDefinitionContextSubject {
- private final MissingDefinitionContext context;
+ private final DefinitionContext context;
- public FoundMissingDefinitionContextSubject(MissingDefinitionContext context) {
+ public FoundMissingDefinitionContextSubject(DefinitionContext context) {
this.context = context;
}
public FoundMissingDefinitionContextSubject assertEqualTo(
- MissingDefinitionClassContext expectedContext) {
+ DefinitionClassContext expectedContext) {
assertTrue(context.isClassContext());
assertEquals(expectedContext.getClassReference(), context.asClassContext().getClassReference());
return this;
}
public FoundMissingDefinitionContextSubject assertEqualTo(
- MissingDefinitionFieldContext expectedContext) {
+ DefinitionFieldContext expectedContext) {
assertTrue(context.isFieldContext());
assertEquals(expectedContext.getFieldReference(), context.asFieldContext().getFieldReference());
return this;
}
public FoundMissingDefinitionContextSubject assertEqualTo(
- MissingDefinitionMethodContext expectedContext) {
+ DefinitionMethodContext expectedContext) {
assertTrue(context.isMethodContext());
assertEquals(
expectedContext.getMethodReference(), context.asMethodContext().getMethodReference());
diff --git a/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionInfoSubject.java b/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionInfoSubject.java
index 89a5db5..2fc9bfa 100644
--- a/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionInfoSubject.java
+++ b/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionInfoSubject.java
@@ -7,9 +7,9 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
+import com.android.tools.r8.diagnostic.DefinitionContext;
import com.android.tools.r8.diagnostic.MissingDefinitionInfo;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionContextUtils;
+import com.android.tools.r8.diagnostic.internal.DefinitionContextUtils;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.FieldReference;
import com.android.tools.r8.references.MethodReference;
@@ -34,7 +34,7 @@
.getReferencedFromContexts()
.forEach(
context ->
- MissingDefinitionContextUtils.accept(
+ DefinitionContextUtils.accept(
context,
classContext ->
classContexts.put(
@@ -51,11 +51,11 @@
}
public FoundMissingDefinitionInfoSubject assertExactContexts(
- List<MissingDefinitionContext> expectedContexts) {
+ List<DefinitionContext> expectedContexts) {
assertEquals(expectedContexts.size(), missingDefinitionInfo.getReferencedFromContexts().size());
expectedContexts.forEach(
expectedContext ->
- MissingDefinitionContextUtils.accept(
+ DefinitionContextUtils.accept(
expectedContext,
expectedClassContext -> {
FoundMissingDefinitionContextSubject subject =
diff --git a/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionsDiagnosticSubject.java b/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionsDiagnosticSubject.java
index 28c8fbd..990d480 100644
--- a/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionsDiagnosticSubject.java
+++ b/src/test/java/com/android/tools/r8/diagnosticinspector/FoundMissingDefinitionsDiagnosticSubject.java
@@ -9,8 +9,8 @@
import static org.junit.Assert.assertTrue;
import com.android.tools.r8.ThrowableConsumer;
+import com.android.tools.r8.diagnostic.DefinitionContext;
import com.android.tools.r8.diagnostic.MissingClassInfo;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
import com.android.tools.r8.diagnostic.MissingDefinitionInfo;
import com.android.tools.r8.diagnostic.MissingDefinitionsDiagnostic;
import com.android.tools.r8.diagnostic.MissingFieldInfo;
@@ -66,12 +66,12 @@
}
public FoundMissingDefinitionsDiagnosticSubject assertIsMissingClassWithExactContexts(
- ClassReference classReference, MissingDefinitionContext... expectedContexts) {
+ ClassReference classReference, DefinitionContext... expectedContexts) {
return assertIsMissingClassWithExactContexts(classReference, Arrays.asList(expectedContexts));
}
public FoundMissingDefinitionsDiagnosticSubject assertIsMissingClassWithExactContexts(
- ClassReference classReference, List<MissingDefinitionContext> expectedContexts) {
+ ClassReference classReference, List<DefinitionContext> expectedContexts) {
return inspectMissingClassInfo(
classReference,
missingClassInfoSubject -> missingClassInfoSubject.assertExactContexts(expectedContexts));
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromCatchHandlerTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromCatchHandlerTest.java
index f45220d..11bc862 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromCatchHandlerTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromCatchHandlerTest.java
@@ -7,15 +7,15 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromCatchHandlerTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromCheckCastTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromCheckCastTest.java
index 37df585..773261d 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromCheckCastTest.java
@@ -7,15 +7,15 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromCheckCastTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromClassAnnotationTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromClassAnnotationTest.java
index d114dc02..cfb378f 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromClassAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromClassAnnotationTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import org.junit.Test;
@@ -17,8 +17,8 @@
// we retain missing annotations even if there is no -keepattributes *Annotations*.
public class MissingClassReferencedFromClassAnnotationTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromClassAnnotationWithDataTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromClassAnnotationWithDataTest.java
index 10663fa..3499bdb 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromClassAnnotationWithDataTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromClassAnnotationWithDataTest.java
@@ -9,8 +9,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.references.Reference;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -18,8 +18,8 @@
public class MissingClassReferencedFromClassAnnotationWithDataTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromConstClassTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromConstClassTest.java
index 94550b8..3cdf187 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromConstClassTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromConstClassTest.java
@@ -7,15 +7,15 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromConstClassTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromEnclosingMethodAttributeTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromEnclosingMethodAttributeTest.java
index 40408ee..da337fd 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromEnclosingMethodAttributeTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromEnclosingMethodAttributeTest.java
@@ -11,8 +11,8 @@
import com.android.tools.r8.R8TestBuilder;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.BooleanUtils;
@@ -22,8 +22,8 @@
public class MissingClassReferencedFromEnclosingMethodAttributeTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(getMainClass()))
.setOrigin(getOrigin(getMainClass()))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromFieldAnnotationTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromFieldAnnotationTest.java
index 7638885..71e9638 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromFieldAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromFieldAnnotationTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.FieldReferenceUtils;
@@ -18,8 +18,8 @@
// we retain missing annotations even if there is no -keepattributes *Annotations*.
public class MissingClassReferencedFromFieldAnnotationTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionFieldContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionFieldContextImpl.builder()
.setFieldContext(FieldReferenceUtils.fieldFromField(Main.class, "FIELD"))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromImplementsClauseTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromImplementsClauseTest.java
index 51da805..e221fbe 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromImplementsClauseTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromImplementsClauseTest.java
@@ -8,16 +8,16 @@
import com.android.tools.r8.TestCompilerBuilder;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import org.junit.Test;
public class MissingClassReferencedFromImplementsClauseTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInnerClassAttributeTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInnerClassAttributeTest.java
index f421eb1..ce77469 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInnerClassAttributeTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInnerClassAttributeTest.java
@@ -11,8 +11,8 @@
import com.android.tools.r8.R8TestBuilder;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.BooleanUtils;
@@ -22,8 +22,8 @@
public class MissingClassReferencedFromInnerClassAttributeTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceGetToExistingFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceGetToExistingFieldTest.java
index 1ce5f9f..f2803fc 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceGetToExistingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceGetToExistingFieldTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl;
import com.android.tools.r8.utils.FieldReferenceUtils;
import org.junit.Test;
@@ -19,8 +19,8 @@
public class MissingClassReferencedFromInstanceGetToExistingFieldTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionFieldContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionFieldContextImpl.builder()
.setFieldContext(FieldReferenceUtils.fieldFromField(Main.class, "field"))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceGetToMissingFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceGetToMissingFieldTest.java
index f367fed..49105ae 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceGetToMissingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceGetToMissingFieldTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
@@ -19,8 +19,8 @@
public class MissingClassReferencedFromInstanceGetToMissingFieldTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceOfTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceOfTest.java
index 7ec1e09..7059a7d 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstanceOfTest.java
@@ -7,15 +7,15 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromInstanceOfTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstancePutToExistingFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstancePutToExistingFieldTest.java
index 1f0e5a7..21e65c8 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstancePutToExistingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstancePutToExistingFieldTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl;
import com.android.tools.r8.utils.FieldReferenceUtils;
import org.junit.Test;
@@ -19,8 +19,8 @@
public class MissingClassReferencedFromInstancePutToExistingFieldTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionFieldContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionFieldContextImpl.builder()
.setFieldContext(FieldReferenceUtils.fieldFromField(Main.class, "field"))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstancePutToMissingFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstancePutToMissingFieldTest.java
index b4dd5a1..687aa72 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstancePutToMissingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInstancePutToMissingFieldTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
@@ -19,8 +19,8 @@
public class MissingClassReferencedFromInstancePutToMissingFieldTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToAbsentMethodParameterTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToAbsentMethodParameterTest.java
index 31e1942..1d7d4ca 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToAbsentMethodParameterTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToAbsentMethodParameterTest.java
@@ -9,8 +9,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import com.google.common.collect.ImmutableList;
import java.io.IOException;
@@ -24,8 +24,8 @@
public class MissingClassReferencedFromInvokeVirtualToAbsentMethodParameterTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToAbsentMethodReturnTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToAbsentMethodReturnTest.java
index 4c62ad2..b997418 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToAbsentMethodReturnTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToAbsentMethodReturnTest.java
@@ -9,8 +9,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import com.google.common.collect.ImmutableList;
import java.io.IOException;
@@ -24,8 +24,8 @@
public class MissingClassReferencedFromInvokeVirtualToAbsentMethodReturnTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToPresentMethodParameterTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToPresentMethodParameterTest.java
index 28c1a79..9930828 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToPresentMethodParameterTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToPresentMethodParameterTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
@@ -19,8 +19,8 @@
public class MissingClassReferencedFromInvokeVirtualToPresentMethodParameterTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
MethodReferenceUtils.methodFromMethod(Main.class, "get", MissingClass.class))
.setOrigin(getOrigin(Main.class))
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToPresentMethodReturnTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToPresentMethodReturnTest.java
index 396117f..49f5b94 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToPresentMethodReturnTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromInvokeVirtualToPresentMethodReturnTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
@@ -19,8 +19,8 @@
public class MissingClassReferencedFromInvokeVirtualToPresentMethodReturnTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.methodFromMethod(Main.class, "get"))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptFieldTest.java
index c212d86..9c82922 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptFieldTest.java
@@ -8,16 +8,16 @@
import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl;
import com.android.tools.r8.utils.FieldReferenceUtils;
import org.junit.Test;
/** If a field definition refers to a missing class, then the field definition is to be blamed. */
public class MissingClassReferencedFromKeptFieldTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionFieldContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionFieldContextImpl.builder()
.setFieldContext(FieldReferenceUtils.fieldFromField(Main.class, "FIELD"))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptMethodParameterTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptMethodParameterTest.java
index fc2d8d3..ba2d1eb 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptMethodParameterTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptMethodParameterTest.java
@@ -8,16 +8,16 @@
import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
/** If a method definition refers to a missing class, then the method definition is to be blamed. */
public class MissingClassReferencedFromKeptMethodParameterTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
MethodReferenceUtils.methodFromMethod(Main.class, "get", MissingClass.class))
.setOrigin(getOrigin(Main.class))
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptMethodReturnTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptMethodReturnTest.java
index 6dc3edb..dc940b2 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptMethodReturnTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromKeptMethodReturnTest.java
@@ -8,16 +8,16 @@
import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
/** If a method definition refers to a missing class, then the method definition is to be blamed. */
public class MissingClassReferencedFromKeptMethodReturnTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.methodFromMethod(Main.class, "get"))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryInstanceFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryInstanceFieldTest.java
index 860bce2..e3e4d0f 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryInstanceFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryInstanceFieldTest.java
@@ -11,15 +11,15 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl;
import com.android.tools.r8.utils.FieldReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromLibraryInstanceFieldTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionFieldContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionFieldContextImpl.builder()
.setFieldContext(FieldReferenceUtils.fieldFromField(Library.class, "field"))
.setOrigin(getOrigin(Library.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryStaticFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryStaticFieldTest.java
index c5c7950..87ccb41 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryStaticFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryStaticFieldTest.java
@@ -11,15 +11,15 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl;
import com.android.tools.r8.utils.FieldReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromLibraryStaticFieldTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionFieldContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionFieldContextImpl.builder()
.setFieldContext(FieldReferenceUtils.fieldFromField(Library.class, "field"))
.setOrigin(getOrigin(Library.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryVirtualMethodParameterTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryVirtualMethodParameterTest.java
index 4a56add..654ae54 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryVirtualMethodParameterTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryVirtualMethodParameterTest.java
@@ -11,16 +11,16 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromLibraryVirtualMethodParameterTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
MethodReferenceUtils.methodFromMethod(Library.class, "method", MissingClass.class))
.setOrigin(getOrigin(Library.class))
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryVirtualMethodReturnTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryVirtualMethodReturnTest.java
index 5c627ef..1e659de 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryVirtualMethodReturnTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromLibraryVirtualMethodReturnTest.java
@@ -11,16 +11,16 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromLibraryVirtualMethodReturnTest
extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.methodFromMethod(Library.class, "method"))
.setOrigin(getOrigin(Library.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromMethodAnnotationTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromMethodAnnotationTest.java
index 5130304..b4c5a43 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromMethodAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromMethodAnnotationTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.MethodReferenceUtils;
@@ -18,8 +18,8 @@
// we retain missing annotations even if there is no -keepattributes *Annotations*.
public class MissingClassReferencedFromMethodAnnotationTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNestHostAttributeTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNestHostAttributeTest.java
index 194e12d..da8c6cb 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNestHostAttributeTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNestHostAttributeTest.java
@@ -9,8 +9,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.missingclasses.MissingClassReferencedFromNestHostAttributeTest.MissingClass.Main;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
@@ -21,8 +21,8 @@
public class MissingClassReferencedFromNestHostAttributeTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNestMemberAttributeTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNestMemberAttributeTest.java
index 540620e..ae99dbc 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNestMemberAttributeTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNestMemberAttributeTest.java
@@ -9,8 +9,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import com.google.common.collect.ImmutableList;
@@ -20,8 +20,8 @@
public class MissingClassReferencedFromNestMemberAttributeTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNewArrayTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNewArrayTest.java
index 003b28e..2e047e5 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNewArrayTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNewArrayTest.java
@@ -7,15 +7,15 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromNewArrayTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNewInstanceTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNewInstanceTest.java
index ee919b2..274e3d0 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNewInstanceTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromNewInstanceTest.java
@@ -7,15 +7,15 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromNewInstanceTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromOuterClassAttributeTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromOuterClassAttributeTest.java
index 21d5683..38b464d 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromOuterClassAttributeTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromOuterClassAttributeTest.java
@@ -11,8 +11,8 @@
import com.android.tools.r8.R8TestBuilder;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.missingclasses.MissingClassReferencedFromOuterClassAttributeTest.MissingClass.Main;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
@@ -23,8 +23,8 @@
public class MissingClassReferencedFromOuterClassAttributeTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromParameterAnnotationTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromParameterAnnotationTest.java
index a5b5432..021991f 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromParameterAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromParameterAnnotationTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.MethodReferenceUtils;
@@ -18,8 +18,8 @@
// we retain missing annotations even if there is no -keepattributes *Annotations*.
public class MissingClassReferencedFromParameterAnnotationTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticGetToExistingFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticGetToExistingFieldTest.java
index 332da9c..d870671 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticGetToExistingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticGetToExistingFieldTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl;
import com.android.tools.r8.utils.FieldReferenceUtils;
import org.junit.Test;
@@ -18,8 +18,8 @@
*/
public class MissingClassReferencedFromStaticGetToExistingFieldTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionFieldContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionFieldContextImpl.builder()
.setFieldContext(FieldReferenceUtils.fieldFromField(Main.class, "FIELD"))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticGetToMissingFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticGetToMissingFieldTest.java
index 9028167..52944a8 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticGetToMissingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticGetToMissingFieldTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
@@ -18,8 +18,8 @@
*/
public class MissingClassReferencedFromStaticGetToMissingFieldTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticPutToExistingFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticPutToExistingFieldTest.java
index cbbd217..3b0f099 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticPutToExistingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticPutToExistingFieldTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl;
import com.android.tools.r8.utils.FieldReferenceUtils;
import org.junit.Test;
@@ -18,8 +18,8 @@
*/
public class MissingClassReferencedFromStaticPutToExistingFieldTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionFieldContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionFieldContextImpl.builder()
.setFieldContext(FieldReferenceUtils.fieldFromField(Main.class, "FIELD"))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticPutToMissingFieldTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticPutToMissingFieldTest.java
index e1ba4c6..b8488cc 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticPutToMissingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromStaticPutToMissingFieldTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
@@ -18,8 +18,8 @@
*/
public class MissingClassReferencedFromStaticPutToMissingFieldTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromSuperClassTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromSuperClassTest.java
index 79cff47..651b6dd 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromSuperClassTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromSuperClassTest.java
@@ -8,15 +8,15 @@
import com.android.tools.r8.TestCompilerBuilder;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionClassContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl;
import com.android.tools.r8.references.Reference;
import org.junit.Test;
public class MissingClassReferencedFromSuperClassTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionClassContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionClassContextImpl.builder()
.setClassContext(Reference.classFromClass(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromThrowsClauseTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromThrowsClauseTest.java
index 275e6f2..f5fd22e 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromThrowsClauseTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromThrowsClauseTest.java
@@ -8,15 +8,15 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestShrinkerBuilder;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.utils.MethodReferenceUtils;
import org.junit.Test;
public class MissingClassReferencedFromThrowsClauseTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build();
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromThrowsClauseWithNoShrinkingTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromThrowsClauseWithNoShrinkingTest.java
index b9d0ef6..7542952 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromThrowsClauseWithNoShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromThrowsClauseWithNoShrinkingTest.java
@@ -7,8 +7,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.NeverInline;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.DescriptorUtils;
@@ -21,8 +21,8 @@
private static final String NEW_A_DESCRIPTOR = "Lfoo/a;";
private static final String NEW_B_DESCRIPTOR = "Lfoo/b;";
- private static final MissingDefinitionContext referencedFrom =
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext referencedFrom =
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
Reference.method(
Reference.classFromDescriptor("Lfoo/a;"), "foo", ImmutableList.of(), null))
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUnusedLambdaParameterTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUnusedLambdaParameterTest.java
index 31ca7d1..59dea00 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUnusedLambdaParameterTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUnusedLambdaParameterTest.java
@@ -11,8 +11,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.MethodReferenceUtils;
import com.google.common.collect.ImmutableList;
@@ -20,9 +20,9 @@
public class MissingClassReferencedFromUnusedLambdaParameterTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext[] referencedFrom =
- new MissingDefinitionContext[] {
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext[] referencedFrom =
+ new DefinitionContext[] {
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
Reference.method(
Reference.classFromClass(Main.class),
@@ -31,7 +31,7 @@
null))
.setOrigin(getOrigin(Main.class))
.build(),
- MissingDefinitionMethodContextImpl.builder()
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build(),
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUnusedLambdaReturnTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUnusedLambdaReturnTest.java
index 8859780..c1da466 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUnusedLambdaReturnTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUnusedLambdaReturnTest.java
@@ -11,8 +11,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.MethodReferenceUtils;
import java.util.Collections;
@@ -20,9 +20,9 @@
public class MissingClassReferencedFromUnusedLambdaReturnTest extends MissingClassesTestBase {
- private static final MissingDefinitionContext[] referencedFrom =
- new MissingDefinitionContext[] {
- MissingDefinitionMethodContextImpl.builder()
+ private static final DefinitionContext[] referencedFrom =
+ new DefinitionContext[] {
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
Reference.method(
Reference.classFromClass(Main.class),
@@ -31,7 +31,7 @@
Reference.classFromClass(MissingClass.class)))
.setOrigin(getOrigin(Main.class))
.build(),
- MissingDefinitionMethodContextImpl.builder()
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build(),
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUsedLambdaParameterTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUsedLambdaParameterTest.java
index a9ece97..eddc508 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUsedLambdaParameterTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUsedLambdaParameterTest.java
@@ -9,8 +9,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.MethodReferenceUtils;
import com.google.common.collect.ImmutableList;
@@ -18,14 +18,14 @@
public class MissingClassReferencedFromUsedLambdaParameterTest extends MissingClassesTestBase {
- private final MissingDefinitionContext[] referencedFrom =
- new MissingDefinitionContext[] {
- MissingDefinitionMethodContextImpl.builder()
+ private final DefinitionContext[] referencedFrom =
+ new DefinitionContext[] {
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
MethodReferenceUtils.methodFromMethod(I.class, "m", MissingClass.class))
.setOrigin(getOrigin(I.class))
.build(),
- MissingDefinitionMethodContextImpl.builder()
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
Reference.method(
Reference.classFromClass(Main.class),
@@ -34,7 +34,7 @@
null))
.setOrigin(getOrigin(Main.class))
.build(),
- MissingDefinitionMethodContextImpl.builder()
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build()
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUsedLambdaReturnTest.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUsedLambdaReturnTest.java
index ba46bfc..1d46283 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUsedLambdaReturnTest.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassReferencedFromUsedLambdaReturnTest.java
@@ -9,8 +9,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.MethodReferenceUtils;
import java.util.Collections;
@@ -18,13 +18,13 @@
public class MissingClassReferencedFromUsedLambdaReturnTest extends MissingClassesTestBase {
- private final MissingDefinitionContext[] referencedFrom =
- new MissingDefinitionContext[] {
- MissingDefinitionMethodContextImpl.builder()
+ private final DefinitionContext[] referencedFrom =
+ new DefinitionContext[] {
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.methodFromMethod(I.class, "m"))
.setOrigin(getOrigin(I.class))
.build(),
- MissingDefinitionMethodContextImpl.builder()
+ DefinitionMethodContextImpl.builder()
.setMethodContext(
Reference.method(
Reference.classFromClass(Main.class),
@@ -33,7 +33,7 @@
Reference.classFromClass(MissingClass.class)))
.setOrigin(getOrigin(Main.class))
.build(),
- MissingDefinitionMethodContextImpl.builder()
+ DefinitionMethodContextImpl.builder()
.setMethodContext(MethodReferenceUtils.mainMethod(Main.class))
.setOrigin(getOrigin(Main.class))
.build()
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassesTestBase.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassesTestBase.java
index 3022ea4..4dfeca1 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassesTestBase.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassesTestBase.java
@@ -13,8 +13,8 @@
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ThrowableConsumer;
-import com.android.tools.r8.diagnostic.MissingDefinitionContext;
-import com.android.tools.r8.diagnostic.internal.MissingDefinitionContextUtils;
+import com.android.tools.r8.diagnostic.DefinitionContext;
+import com.android.tools.r8.diagnostic.internal.DefinitionContextUtils;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.Reference;
import java.lang.annotation.Retention;
@@ -101,19 +101,18 @@
}
void inspectDiagnosticsWithIgnoreWarnings(
- TestDiagnosticMessages diagnostics, MissingDefinitionContext... referencedFrom) {
+ TestDiagnosticMessages diagnostics, DefinitionContext... referencedFrom) {
assertTrue(referencedFrom.length > 0);
inspectDiagnosticsWithIgnoreWarnings(
diagnostics,
referencedFrom,
getExpectedDiagnosticMessage(
- MissingDefinitionContextUtils.toSourceString(referencedFrom[0]),
- referencedFrom.length));
+ DefinitionContextUtils.toSourceString(referencedFrom[0]), referencedFrom.length));
}
void inspectDiagnosticsWithIgnoreWarnings(
TestDiagnosticMessages diagnostics,
- MissingDefinitionContext[] referencedFrom,
+ DefinitionContext[] referencedFrom,
String expectedDiagnosticMessage) {
diagnostics
.assertOnlyWarnings()
@@ -132,19 +131,18 @@
}
void inspectDiagnosticsWithNoRules(
- TestDiagnosticMessages diagnostics, MissingDefinitionContext... referencedFrom) {
+ TestDiagnosticMessages diagnostics, DefinitionContext... referencedFrom) {
assertTrue(referencedFrom.length > 0);
inspectDiagnosticsWithNoRules(
diagnostics,
referencedFrom,
getExpectedDiagnosticMessage(
- MissingDefinitionContextUtils.toSourceString(referencedFrom[0]),
- referencedFrom.length));
+ DefinitionContextUtils.toSourceString(referencedFrom[0]), referencedFrom.length));
}
void inspectDiagnosticsWithNoRules(
TestDiagnosticMessages diagnostics,
- MissingDefinitionContext[] referencedFrom,
+ DefinitionContext[] referencedFrom,
String expectedDiagnosticMessage) {
diagnostics
.assertOnlyErrors()
