diff options
author | cnsun <cnsun@google.com> | 2018-04-17 15:04:01 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-17 15:05:27 -0700 |
commit | 1a2ab6d54e2a8749549f41055cd66f3f6dfea4cc (patch) | |
tree | 64e5431e5916be435821c6db79d96cc5f0b1549c /src/tools/android/java/com/google/devtools/build/android/desugar | |
parent | 4b3a075b6d36a909d05bd4387f02d70d0805a80c (diff) |
Relax the assertion in Desugar for checking the calls to $closeResource(...).
It is possible that $closeResource(...) is not used as the calls to it might
be eliminated by some optimization tools, such as Proguard.
RELNOTES: n/a.
PiperOrigin-RevId: 193262552
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/desugar')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java b/src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java index 818585f20f..98eef45d88 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java @@ -166,14 +166,12 @@ public class TryWithResourcesRewriter extends ClassVisitor { new CloseResourceMethodSpecializer(cv, resourceInternalName, isInterface)); } } else { + // It is possible that all calls to $closeResources(...) are in dead code regions, and the + // calls are eliminated, which leaving the method $closeResources() unused. (b/78030676). + // In this case, we just discard the method body. checkState( - closeResourceMethod == null, - "The field resourceTypeInternalNames is empty. " - + "But the class has the $closeResource method."); - checkState( - !hasCloseResourceMethod, - "The class %s has close resource method, but resourceTypeInternalNames is empty.", - internalName); + !hasCloseResourceMethod || closeResourceMethod != null, + "There should be $closeResources(...) in the class file."); } super.visitEnd(); } |