- renamed weak* methods in ScalaClassType to is...

- renamed weak* methods in ScalaClassType to isNonTrivial*, which better
reflects what they do, - moved these methods to ClassType, - made
getScalaType return a ClassType, to enable the forthcoming optimisation
making strongly trivial classes return a JavaClassType instead of a
ScalaClassType

3 files changed, 9 insertions, 9 deletions

diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java
index cedd8703cd..32c472e90b 100644
--- a/sources/scalac/symtab/Definitions.java
+++ b/sources/scalac/symtab/Definitions.java
@@ -680,12 +680,12 @@ public class Definitions {
         return TYPECONSTRUCTOR_FUNCTIONOUTER;
     }
 
-    private Symbol SCALACLASSTYPE_WEAKISINSTANCE;
-    public Symbol SCALACLASSTYPE_WEAKISINSTANCE() {
-        if (SCALACLASSTYPE_WEAKISINSTANCE == null)
-            SCALACLASSTYPE_WEAKISINSTANCE =
-                loadTerm(SCALACLASSTYPE_CLASS, Names.weakIsInstance);
-        return SCALACLASSTYPE_WEAKISINSTANCE;
+    private Symbol CLASSTYPE_ISNONTRIVIALINSTANCE;
+    public Symbol CLASSTYPE_ISNONTRIVIALINSTANCE() {
+        if (CLASSTYPE_ISNONTRIVIALINSTANCE == null)
+            CLASSTYPE_ISNONTRIVIALINSTANCE =
+                loadTerm(CLASSTYPE_CLASS, Names.isNonTrivialInstance);
+        return CLASSTYPE_ISNONTRIVIALINSTANCE;
     }
 
     private Symbol SCALACLASSTYPE_SETPARENTS;
diff --git a/sources/scalac/transformer/TypesAsValuesPhase.java b/sources/scalac/transformer/TypesAsValuesPhase.java
index b18afe9525..74161c356e 100644
--- a/sources/scalac/transformer/TypesAsValuesPhase.java
+++ b/sources/scalac/transformer/TypesAsValuesPhase.java
@@ -761,14 +761,14 @@ public class TypesAsValuesPhase extends Phase {
 
                 Tree cheapTest =
                     gen.mkIsInstanceOf(pos, gen.mkLocalRef(pos, val), tp, true);
-                Symbol weakIsInst = defs.SCALACLASSTYPE_WEAKISINSTANCE();
+                Symbol isNonTrivialInst = defs.CLASSTYPE_ISNONTRIVIALINSTANCE();
                 Tree scalaTpVal = gen.mkAsInstanceOf(pos,
                                                      tpVal,
                                                      defs.SCALACLASSTYPE_TYPE(),
                                                      true);
                 Tree expensiveTest =
                     gen.mkApply_V(pos,
-                                  gen.Select(pos, scalaTpVal, weakIsInst),
+                                  gen.Select(pos, scalaTpVal, isNonTrivialInst),
                                   new Tree[] { gen.mkLocalRef(pos, val) });
 
                 Tree bothTests =
diff --git a/sources/scalac/util/Names.java b/sources/scalac/util/Names.java
index 9875857bdd..4ed8c69336 100644
--- a/sources/scalac/util/Names.java
+++ b/sources/scalac/util/Names.java
@@ -226,7 +226,7 @@ public class Names {
     public static final Name update = Name.fromString("update");
     public static final Name view = Name.fromString("view");
     public static final Name wait = Name.fromString("wait");
-    public static final Name weakIsInstance = Name.fromString("weakIsInstance");
+    public static final Name isNonTrivialInstance = Name.fromString("isNonTrivialInstance");
     public static final Name xml = Name.fromString("xml");