Use StringInterner in more places

Change-Id: Ifb4adfe8448dcb02fc0896e245733574e6a97e55

6 files changed, 15 insertions, 10 deletions

diff --git a/jack/src/com/android/jack/ir/ast/JFieldId.java b/jack/src/com/android/jack/ir/ast/JFieldId.java
index 829ea158..f69a26fe 100644
--- a/jack/src/com/android/jack/ir/ast/JFieldId.java
+++ b/jack/src/com/android/jack/ir/ast/JFieldId.java
@@ -17,6 +17,7 @@
 package com.android.jack.ir.ast;
 
 import com.android.jack.Jack;
+import com.android.jack.ir.StringInterner;
 import com.android.sched.marker.LocalMarkerManager;
 
 import javax.annotation.CheckForNull;
@@ -38,7 +39,7 @@ public class JFieldId extends LocalMarkerManager
   private JField field;
 
   public JFieldId(@Nonnull String name, @Nonnull JType type, @Nonnull FieldKind kind) {
-    this.name = name;
+    this.name = StringInterner.get().intern(name);
     this.type = type;
     this.kind = kind;
   }
@@ -63,7 +64,7 @@ public class JFieldId extends LocalMarkerManager
 
   @Override
   public void setName(@Nonnull String name) {
-    this.name = name;
+    this.name = StringInterner.get().intern(name);
   }
 
   @Nonnull
diff --git a/jack/src/com/android/jack/ir/ast/JMethodId.java b/jack/src/com/android/jack/ir/ast/JMethodId.java
index c1c679a4..2673cd6a 100644
--- a/jack/src/com/android/jack/ir/ast/JMethodId.java
+++ b/jack/src/com/android/jack/ir/ast/JMethodId.java
@@ -17,6 +17,7 @@
 package com.android.jack.ir.ast;
 
 import com.android.jack.Jack;
+import com.android.jack.ir.StringInterner;
 import com.android.jack.util.NamingTools;
 import com.android.sched.marker.LocalMarkerManager;
 
@@ -58,7 +59,7 @@ public class JMethodId extends LocalMarkerManager implements HasName, CanBeRenam
     assert !(name.contains("(") || name.contains(")"));
     assert (!(NamingTools.INIT_NAME.equals(name) || NamingTools.STATIC_INIT_NAME.equals(name)))
         || (kind != MethodKind.INSTANCE_VIRTUAL);
-    this.name = name;
+    this.name = StringInterner.get().intern(name);
     this.methodKind = kind;
   }
 
@@ -146,7 +147,7 @@ public class JMethodId extends LocalMarkerManager implements HasName, CanBeRenam
   @Override
   public void setName(@Nonnull String newName) {
     assert !(name.contains("(") || name.contains(")"));
-    this.name = newName;
+    this.name = StringInterner.get().intern(newName);
   }
 
   boolean equals(@Nonnull String otherName, @Nonnull List<? extends JType> otherParamTypes) {
diff --git a/jack/src/com/android/jack/ir/ast/JPackage.java b/jack/src/com/android/jack/ir/ast/JPackage.java
index e95d5bf5..c2737bf7 100644
--- a/jack/src/com/android/jack/ir/ast/JPackage.java
+++ b/jack/src/com/android/jack/ir/ast/JPackage.java
@@ -16,6 +16,7 @@
 
 package com.android.jack.ir.ast;
 
+import com.android.jack.ir.StringInterner;
 import com.android.jack.ir.sourceinfo.SourceInfo;
 import com.android.jack.load.PackageLoader;
 import com.android.jack.lookup.JLookupException;
@@ -108,7 +109,7 @@ public class JPackage extends JNode implements HasName, CanBeRenamed, HasEnclosi
       @Nonnull List<PackageLoader> loaders) {
     super(SourceInfo.UNKNOWN);
     this.session = session;
-    this.name = name;
+    this.name = StringInterner.get().intern(name);
     this.loaders.addAll(loaders);
     if (enclosingPackage != null) {
       assert !name.isEmpty();
@@ -322,7 +323,7 @@ public class JPackage extends JNode implements HasName, CanBeRenamed, HasEnclosi
 
   @Override
   public void setName(@Nonnull String name) {
-    this.name = name;
+    this.name = StringInterner.get().intern(name);
   }
 
   public boolean isDefaultPackage() {
diff --git a/jack/src/com/android/jack/ir/ast/JPrimitiveType.java b/jack/src/com/android/jack/ir/ast/JPrimitiveType.java
index ea4301cf..0f7fece9 100644
--- a/jack/src/com/android/jack/ir/ast/JPrimitiveType.java
+++ b/jack/src/com/android/jack/ir/ast/JPrimitiveType.java
@@ -17,6 +17,7 @@ package com.android.jack.ir.ast;
 
 
 import com.android.jack.Jack;
+import com.android.jack.ir.StringInterner;
 import com.android.jack.ir.sourceinfo.SourceInfo;
 import com.android.jack.ir.types.JFloatingPointType;
 import com.android.jack.ir.types.JIntegralType32;
@@ -68,7 +69,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
 
   private JPrimitiveType(@Nonnull String name) {
     super(SourceInfo.UNKNOWN);
-    this.name = name;
+    this.name = StringInterner.get().intern(name);
   }
 
   @Override
diff --git a/jack/src/com/android/jack/ir/ast/JReferenceTypeCommon.java b/jack/src/com/android/jack/ir/ast/JReferenceTypeCommon.java
index 1e1f1490..1fbab123 100644
--- a/jack/src/com/android/jack/ir/ast/JReferenceTypeCommon.java
+++ b/jack/src/com/android/jack/ir/ast/JReferenceTypeCommon.java
@@ -16,6 +16,7 @@
 package com.android.jack.ir.ast;
 
 import com.android.jack.Jack;
+import com.android.jack.ir.StringInterner;
 import com.android.jack.ir.ast.JPrimitiveType.JPrimitiveTypeEnum;
 import com.android.jack.ir.sourceinfo.SourceInfo;
 import com.android.jack.lookup.CommonTypes;
@@ -42,7 +43,7 @@ abstract class JReferenceTypeCommon extends JNode implements JReferenceType, Can
 
   public JReferenceTypeCommon(@Nonnull SourceInfo info, @Nonnull String name) {
     super(info);
-    this.name = name;
+    this.name = StringInterner.get().intern(name);
   }
 
   @Override
@@ -53,7 +54,7 @@ abstract class JReferenceTypeCommon extends JNode implements JReferenceType, Can
 
   @Override
   public void setName(@Nonnull String name) {
-    this.name = name;
+    this.name = StringInterner.get().intern(name);
     assert Jack.getSession().getPhantomLookup().check(this);
   }
 
diff --git a/jack/src/com/android/jack/ir/ast/JVariable.java b/jack/src/com/android/jack/ir/ast/JVariable.java
index 116bedf7..fc658362 100644
--- a/jack/src/com/android/jack/ir/ast/JVariable.java
+++ b/jack/src/com/android/jack/ir/ast/JVariable.java
@@ -68,7 +68,7 @@ public abstract class JVariable extends JNode implements HasName, CanBeSetFinal,
 
   @Override
   public void setName(@CheckForNull String name) {
-    this.name = name;
+    this.name = name == null ? null : StringInterner.get().intern(name);
   }
 
   @Override