commit 3fc864c03f5fd68a18c40e92359825e6c3875548
author Yohann Roussel <yroussel@google.com> Wed Oct 25 17:00:25 2017 +0200
committer Yohann Roussel <yroussel@google.com> Wed Oct 25 15:14:13 2017 +0000
tree c39a24a3ab38d03d70617ab4a6801a2067b22926
parent 8cd950bc7b907ffc166a5f1e037a4a62265a0c07

Use SourceInfo.getLocation

Instead of trying to do a manual conversion that may cause an
UnsupportedOperationException if SourceInfo is UNKNOWN.

Bug: 68249204
Change-Id: Id7714f56a2e285e320cd8eee772198b7cc53410d

jack/src/com/android/jack/shrob/obfuscation/Renamer.java

diff --git a/jack/src/com/android/jack/shrob/obfuscation/Renamer.java b/jack/src/com/android/jack/shrob/obfuscation/Renamer.java
index 346e4a1..f451c5b 100644
--- a/jack/src/com/android/jack/shrob/obfuscation/Renamer.java
+++ b/jack/src/com/android/jack/shrob/obfuscation/Renamer.java
@@ -32,7 +32,6 @@
 import com.android.jack.ir.ast.JSession;
 import com.android.jack.ir.ast.JType;
 import com.android.jack.ir.ast.JVisitor;
-import com.android.jack.ir.sourceinfo.SourceInfo;
 import com.android.jack.library.DumpInLibrary;
 import com.android.jack.reporting.Reportable.ProblemLevel;
 import com.android.jack.reporting.Reporter.Severity;
@@ -55,8 +54,6 @@
 import com.android.sched.util.config.ThreadConfig;
 import com.android.sched.util.config.id.BooleanPropertyId;
 import com.android.sched.util.config.id.PropertyId;
-import com.android.sched.util.location.ColumnAndLineLocation;
-import com.android.sched.util.location.FileLocation;
 
 import java.io.File;
 import java.util.Collection;
@@ -257,15 +254,12 @@
                 }
               } while (foundName);
             } catch (MaskedHierarchy e) {
-              SourceInfo sourceInfo = field.getSourceInfo();
               Jack.getSession()
                   .getReporter()
                   .report(
                       Severity.NON_FATAL,
                       new ObfuscationContextInfo(
-                          new ColumnAndLineLocation(
-                              new FileLocation(sourceInfo.getFileName()),
-                              sourceInfo.getStartLine()),
+                          field.getSourceInfo().getLocation(),
                           ProblemLevel.INFO,
                           e));
             }
@@ -290,15 +284,12 @@
                 }
               } while (foundName);
             } catch (MaskedHierarchy e) {
-              SourceInfo sourceInfo = method.getSourceInfo();
               Jack.getSession()
                   .getReporter()
                   .report(
                       Severity.NON_FATAL,
                       new ObfuscationContextInfo(
-                          new ColumnAndLineLocation(
-                              new FileLocation(sourceInfo.getFileName()),
-                              sourceInfo.getStartLine()),
+                          method.getSourceInfo().getLocation(),
                           ProblemLevel.INFO,
                           e));
             }