summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
Diffstat (limited to 'sources')
-rw-r--r--sources/scalac/backend/Primitive.java21
-rw-r--r--sources/scalac/backend/Primitives.java80
-rw-r--r--sources/scalac/backend/jvm/GenJVM.java14
-rw-r--r--sources/scalac/backend/msil/GenMSIL.java3
-rw-r--r--sources/scalac/transformer/ErasurePhase.java2
5 files changed, 0 insertions, 120 deletions
diff --git a/sources/scalac/backend/Primitive.java b/sources/scalac/backend/Primitive.java
index 3f8a658b3e..db05bea7ac 100644
--- a/sources/scalac/backend/Primitive.java
+++ b/sources/scalac/backend/Primitive.java
@@ -67,27 +67,6 @@ public class Primitive {
public case APPLY { tag = 25; } // x(y)
public case UPDATE { tag = 26; } // x(y) = z
- // Conversion operations
- public case AS_UVALUE { tag = 27; } // x.asUnit()
- public case AS_ZVALUE { tag = 28; } // x.asBoolean()
- public case AS_BVALUE { tag = 29; } // x.asByte()
- public case AS_SVALUE { tag = 30; } // x.asShort()
- public case AS_CVALUE { tag = 31; } // x.asChar()
- public case AS_IVALUE { tag = 32; } // x.asInt()
- public case AS_LVALUE { tag = 33; } // x.asLong()
- public case AS_FVALUE { tag = 34; } // x.asFloat()
- public case AS_DVALUE { tag = 35; } // x.asDouble()
- public case AS_ZARRAY { tag = 36; } // x.asBooleanArray()
- public case AS_BARRAY { tag = 37; } // x.asByteArray()
- public case AS_SARRAY { tag = 38; } // x.asShortArray()
- public case AS_CARRAY { tag = 39; } // x.asCharArray()
- public case AS_IARRAY { tag = 40; } // x.asIntArray()
- public case AS_LARRAY { tag = 41; } // x.asLongArray()
- public case AS_FARRAY { tag = 42; } // x.asFloatArray()
- public case AS_DARRAY { tag = 43; } // x.asDoubleArray()
- public case AS_OARRAY { tag = 44; } // x.asObjectArray()
- public case AS__ARRAY { tag = 44; } // x.asArray()
-
// Any operations
public case IS { tag = 45; } // x.is[y]
public case AS { tag = 46; } // x.as[y]
diff --git a/sources/scalac/backend/Primitives.java b/sources/scalac/backend/Primitives.java
index 0867106282..62444b60da 100644
--- a/sources/scalac/backend/Primitives.java
+++ b/sources/scalac/backend/Primitives.java
@@ -117,27 +117,6 @@ public class Primitives {
private static final Name UNBOX_OARRAY_N = Name.fromString("unbox_oarray");
private static final Name UNBOX__ARRAY_N = Name.fromString("unbox__array");
- private static final Name AS_UVALUE_N = Name.fromString("asUnit");
- private static final Name AS_ZVALUE_N = Name.fromString("asBoolean");
- private static final Name AS_BVALUE_N = Name.fromString("asByte");
- private static final Name AS_SVALUE_N = Name.fromString("asShort");
- private static final Name AS_CVALUE_N = Name.fromString("asChar");
- private static final Name AS_IVALUE_N = Name.fromString("asInt");
- private static final Name AS_LVALUE_N = Name.fromString("asLong");
- private static final Name AS_FVALUE_N = Name.fromString("asFloat");
- private static final Name AS_DVALUE_N = Name.fromString("asDouble");
-
- private static final Name AS_ZARRAY_N = Name.fromString("asBooleanArray");
- private static final Name AS_BARRAY_N = Name.fromString("asByteArray");
- private static final Name AS_SARRAY_N = Name.fromString("asShortArray");
- private static final Name AS_CARRAY_N = Name.fromString("asCharArray");
- private static final Name AS_IARRAY_N = Name.fromString("asIntArray");
- private static final Name AS_LARRAY_N = Name.fromString("asLongArray");
- private static final Name AS_FARRAY_N = Name.fromString("asFloatArray");
- private static final Name AS_DARRAY_N = Name.fromString("asDoubleArray");
- private static final Name AS_OARRAY_N = Name.fromString("asObjectArray");
- private static final Name AS__ARRAY_N = Name.fromString("asArray");
-
private static final Name B2B_N = Name.fromString("b2b");
private static final Name B2S_N = Name.fromString("b2s");
private static final Name B2C_N = Name.fromString("b2c");
@@ -279,27 +258,6 @@ public class Primitives {
public final Symbol UNBOX_OARRAY;
public final Symbol UNBOX__ARRAY;
- public final Symbol AS_UVALUE;
- public final Symbol AS_ZVALUE;
- public final Symbol AS_BVALUE;
- public final Symbol AS_SVALUE;
- public final Symbol AS_CVALUE;
- public final Symbol AS_IVALUE;
- public final Symbol AS_LVALUE;
- public final Symbol AS_FVALUE;
- public final Symbol AS_DVALUE;
-
- public final Symbol AS_ZARRAY;
- public final Symbol AS_BARRAY;
- public final Symbol AS_SARRAY;
- public final Symbol AS_CARRAY;
- public final Symbol AS_IARRAY;
- public final Symbol AS_LARRAY;
- public final Symbol AS_FARRAY;
- public final Symbol AS_DARRAY;
- public final Symbol AS_OARRAY;
- public final Symbol AS__ARRAY;
-
public final Symbol B2B;
public final Symbol B2S;
public final Symbol B2C;
@@ -481,25 +439,6 @@ public class Primitives {
this.D2L = getUniqueTerm(RUNTIME, D2L_N);
this.D2F = getUniqueTerm(RUNTIME, D2F_N);
this.D2D = getUniqueTerm(RUNTIME, D2D_N);
- this.AS_UVALUE = getUniqueTerm(definitions.UNIT_CLASS, AS_UVALUE_N);
- this.AS_ZVALUE = getUniqueTerm(definitions.BOOLEAN_CLASS, AS_ZVALUE_N);
- this.AS_BVALUE = getUniqueTerm(definitions.DOUBLE_CLASS, AS_BVALUE_N);
- this.AS_SVALUE = getUniqueTerm(definitions.DOUBLE_CLASS, AS_SVALUE_N);
- this.AS_CVALUE = getUniqueTerm(definitions.DOUBLE_CLASS, AS_CVALUE_N);
- this.AS_IVALUE = getUniqueTerm(definitions.DOUBLE_CLASS, AS_IVALUE_N);
- this.AS_LVALUE = getUniqueTerm(definitions.DOUBLE_CLASS, AS_LVALUE_N);
- this.AS_FVALUE = getUniqueTerm(definitions.DOUBLE_CLASS, AS_FVALUE_N);
- this.AS_DVALUE = getUniqueTerm(definitions.DOUBLE_CLASS, AS_DVALUE_N);
- this.AS_ZARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_ZARRAY_N);
- this.AS_BARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_BARRAY_N);
- this.AS_SARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_SARRAY_N);
- this.AS_CARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_CARRAY_N);
- this.AS_IARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_IARRAY_N);
- this.AS_LARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_LARRAY_N);
- this.AS_FARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_FARRAY_N);
- this.AS_DARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_DARRAY_N);
- this.AS_OARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS_OARRAY_N);
- this.AS__ARRAY = getUniqueTerm(definitions.ARRAY_CLASS, AS__ARRAY_N);
initPrimitives();
}
@@ -538,7 +477,6 @@ public class Primitives {
addAll(defs.UNIT_CLASS, Names.equals, Primitive.EQUALS, 1);
addAll(defs.UNIT_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
addAll(defs.UNIT_CLASS, Names.toString, Primitive.TOSTRING, 1);
- addPrimitive(AS_UVALUE, Primitive.AS_UVALUE);
// !!! addAll(defs.UNIT_CLASS, Names.ADD, Primitive.CONCAT, 1);
// scala.Boolean
@@ -547,7 +485,6 @@ public class Primitives {
addAll(defs.BOOLEAN_CLASS, Names.equals, Primitive.EQUALS, 1);
addAll(defs.BOOLEAN_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
addAll(defs.BOOLEAN_CLASS, Names.toString, Primitive.TOSTRING, 1);
- addPrimitive(AS_ZVALUE, Primitive.AS_ZVALUE);
addAll(defs.BOOLEAN_CLASS, Names.ZNOT, Primitive.ZNOT, 1);
addAll(defs.BOOLEAN_CLASS, Names.OR, Primitive.OR, 1);
addAll(defs.BOOLEAN_CLASS, Names.XOR, Primitive.XOR, 1);
@@ -639,13 +576,6 @@ public class Primitives {
//addAll(defs.DOUBLE_CLASS, Names.equals, Primitive.EQUALS, 1);
addAll(defs.DOUBLE_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
addAll(defs.DOUBLE_CLASS, Names.toString, Primitive.TOSTRING, 1);
- addPrimitive(AS_BVALUE, Primitive.AS_BVALUE);
- addPrimitive(AS_SVALUE, Primitive.AS_SVALUE);
- addPrimitive(AS_CVALUE, Primitive.AS_CVALUE);
- addPrimitive(AS_IVALUE, Primitive.AS_IVALUE);
- addPrimitive(AS_LVALUE, Primitive.AS_LVALUE);
- addPrimitive(AS_FVALUE, Primitive.AS_FVALUE);
- addPrimitive(AS_DVALUE, Primitive.AS_DVALUE);
addAdd(defs.DOUBLE_CLASS, 1);
addSub(defs.DOUBLE_CLASS, 1);
addAll(defs.DOUBLE_CLASS, Names.MUL, Primitive.MUL, 1);
@@ -662,16 +592,6 @@ public class Primitives {
// !!! addAll(defs.ARRAY_CLASS, Names.equals, Primitive.EQUALS, 1);
// !!! addAll(defs.ARRAY_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
// !!! addAll(defs.ARRAY_CLASS, Names.toString, Primitive.TOSTRING, 1);
- addPrimitive(AS_ZARRAY, Primitive.AS_ZARRAY);
- addPrimitive(AS_BARRAY, Primitive.AS_BARRAY);
- addPrimitive(AS_SARRAY, Primitive.AS_SARRAY);
- addPrimitive(AS_CARRAY, Primitive.AS_CARRAY);
- addPrimitive(AS_IARRAY, Primitive.AS_IARRAY);
- addPrimitive(AS_LARRAY, Primitive.AS_LARRAY);
- addPrimitive(AS_FARRAY, Primitive.AS_FARRAY);
- addPrimitive(AS_DARRAY, Primitive.AS_DARRAY);
- addPrimitive(AS_OARRAY, Primitive.AS_OARRAY);
- addPrimitive(AS__ARRAY, Primitive.AS__ARRAY);
addAll(defs.ARRAY_CLASS, Names.length, Primitive.LENGTH, 1);
addAll(defs.ARRAY_CLASS, Names.apply, Primitive.APPLY, 2);
addAll(defs.ARRAY_CLASS, Names.update, Primitive.UPDATE, 1);
diff --git a/sources/scalac/backend/jvm/GenJVM.java b/sources/scalac/backend/jvm/GenJVM.java
index eef9334aca..635b88bd66 100644
--- a/sources/scalac/backend/jvm/GenJVM.java
+++ b/sources/scalac/backend/jvm/GenJVM.java
@@ -376,12 +376,6 @@ class GenJVM {
generatedType = JType.INT;
break;
- case AS_UVALUE :
- assert args.length == 0;
- gen(ctx, ((Tree.Select)fun).qualifier);
- generatedType = JType.VOID;
- break;
-
default:
throw Debug.abort("unknown primitive ", prim);
}
@@ -1174,16 +1168,8 @@ class GenJVM {
case IS : case AS : case ID :
case CONCAT :
case THROW :
- case AS_UVALUE :
return true;
- case AS_ZVALUE : case AS_BVALUE : case AS_SVALUE :
- case AS_CVALUE : case AS_IVALUE : case AS_LVALUE :
- case AS_FVALUE : case AS_DVALUE :
- case AS_ZARRAY : case AS_BARRAY : case AS_SARRAY :
- case AS_CARRAY : case AS_IARRAY : case AS_LARRAY :
- case AS_FARRAY : case AS_DARRAY : case AS_OARRAY :
- case AS__ARRAY :
case EQUALS :
case HASHCODE :
case TOSTRING :
diff --git a/sources/scalac/backend/msil/GenMSIL.java b/sources/scalac/backend/msil/GenMSIL.java
index 37b44233e5..86044be914 100644
--- a/sources/scalac/backend/msil/GenMSIL.java
+++ b/sources/scalac/backend/msil/GenMSIL.java
@@ -743,9 +743,6 @@ public final class GenMSIL {
return items.StaticItem(MSILType.REF(tc.SCALA_UNIT),
tc.RUNTIME_UNIT_VAL);
}
- if (sym == primitives.AS_UVALUE) {
- return coerce(gen(qualifier, MSILType.VOID), MSILType.VOID);
- }
if (sym == defs.ANY_EQEQ) {
return genEq(qualifier, args[0]);
}
diff --git a/sources/scalac/transformer/ErasurePhase.java b/sources/scalac/transformer/ErasurePhase.java
index b7ca13b670..2175d48555 100644
--- a/sources/scalac/transformer/ErasurePhase.java
+++ b/sources/scalac/transformer/ErasurePhase.java
@@ -89,8 +89,6 @@ public class ErasurePhase extends Phase {
case Primitive.AS : return tp;
case Primitive.BOX: return eraseBoxMethodType(tp);
case Primitive.UNBOX: return eraseUnboxMethodType(tp);
- case Primitive.AS__ARRAY:
- return Type.MethodType(Symbol.EMPTY_ARRAY, definitions.ANY_CLASS.nextType());
default : return tp.erasure();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-04 08:55:40 +0000