From af7df1fc39dc3e9f6f9614233d899f8c91cb4119 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 13 Aug 2018 12:27:04 -0700 Subject: Changed all instances of /*itf=*/ to /*isInterface=*/ to eliminate errors. RELNOTES: None PiperOrigin-RevId: 208523963 --- .../google/devtools/build/android/desugar/CoreLibrarySupport.java | 6 +++--- .../devtools/build/android/desugar/DefaultMethodClassFixer.java | 4 ++-- .../com/google/devtools/build/android/desugar/LambdaClassFixer.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibrarySupport.java b/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibrarySupport.java index 9dfd43af9d..4ebcce92c5 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibrarySupport.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibrarySupport.java @@ -399,7 +399,7 @@ class CoreLibrarySupport { emulationInterface, method.name(), method.descriptor(), - /*itf=*/ true); + /*isInterface=*/ true); dispatchMethod.visitInsn(methodType.getReturnType().getOpcode(Opcodes.IRETURN)); dispatchMethod.visitLabel(fallthrough); @@ -428,7 +428,7 @@ class CoreLibrarySupport { target, method.name(), InterfaceDesugaring.companionDefaultMethodDescriptor(testedName, method.descriptor()), - /*itf=*/ false); + /*isInterface=*/ false); dispatchMethod.visitInsn(methodType.getReturnType().getOpcode(Opcodes.IRETURN)); dispatchMethod.visitLabel(fallthrough); @@ -444,7 +444,7 @@ class CoreLibrarySupport { InterfaceDesugaring.getCompanionClassName(owner), method.name(), companionDesc, - /*itf=*/ false); + /*isInterface=*/ false); dispatchMethod.visitInsn(methodType.getReturnType().getOpcode(Opcodes.IRETURN)); dispatchMethod.visitMaxs(0, 0); diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java b/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java index 130c197f9a..51a6a44b53 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java @@ -522,7 +522,7 @@ public class DefaultMethodClassFixer extends ClassVisitor { owner, name, InterfaceDesugaring.companionDefaultMethodDescriptor(receiverName, desc), - /*itf=*/ false); + /*isInterface=*/ false); stubMethod.visitInsn(neededType.getReturnType().getOpcode(Opcodes.IRETURN)); stubMethod.visitMaxs(0, 0); // rely on class writer to compute these @@ -555,7 +555,7 @@ public class DefaultMethodClassFixer extends ClassVisitor { internalName, name, neededType.getDescriptor(), - /*itf=*/ false); + /*isInterface=*/ false); stubMethod.visitInsn(neededType.getReturnType().getOpcode(Opcodes.IRETURN)); stubMethod.visitMaxs(0, 0); // rely on class writer to compute these diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java b/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java index 6b0a9214ee..180dc0980a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java @@ -192,7 +192,7 @@ class LambdaClassFixer extends ClassVisitor { getInternalName(), "", checkNotNull(desc, "didn't see a constructor for %s", getInternalName()), - /*itf=*/ false); + /*isInterface=*/ false); codeBuilder.visitFieldInsn( Opcodes.PUTSTATIC, getInternalName(), SINGLETON_FIELD_NAME, singletonFieldDesc); codeBuilder.visitInsn(Opcodes.RETURN); -- cgit v1.2.3