Add ImmutableLabelRemover to match other ShadowedApiInvocationSite visitors
In addtional to the existing matching at createClassVisitorsForClassesInInputs method
@@ -847,6 +847,7 @@ public class Desugar {
// Don't need a ClassReaderFactory b/c static interface methods should've been moved.
ClassVisitor visitor = writer;
if (coreLibrarySupport != null) {
+ visitor = new ImmutableLabelRemover(visitor);
visitor = new EmulatedInterfaceRewriter(visitor, coreLibrarySupport);
visitor = new CorePackageRenamer(visitor, coreLibrarySupport);
visitor = new CoreLibraryInvocationRewriter(visitor, coreLibrarySupport);
@@ -921,6 +922,7 @@ public class Desugar {
ClassVisitor visitor = checkNotNull(writer);
if (coreLibrarySupport != null) {
+ visitor = new ImmutableLabelRemover(visitor);
visitor = new EmulatedInterfaceRewriter(visitor, coreLibrarySupport);
visitor = new CorePackageRenamer(visitor, coreLibrarySupport);
visitor = new CoreLibraryInvocationRewriter(visitor, coreLibrarySupport);
