Remove the deprecated flattenropes op.

MoarVM · Nov 16, 2016 · 1dc68e5 · 1dc68e5
1 parent bc6e933
commit 1dc68e5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 20 deletions.
diff --git a/lib/MAST/Ops.nqp b/lib/MAST/Ops.nqp
@@ -3907,7 +3907,7 @@ BEGIN {
     'rindexfrom', 232,
     'escape', 233,
     'flip', 234,
-    'flattenropes', 235,
+    'DEPRECATED_1', 235,
     'iscclass', 236,
     'findcclass', 237,
     'findnotcclass', 238,
@@ -4723,7 +4723,7 @@ BEGIN {
     'rindexfrom',
     'escape',
     'flip',
-    'flattenropes',
+    'DEPRECATED_1',
     'iscclass',
     'findcclass',
     'findnotcclass',

diff --git a/src/core/interp.c b/src/core/interp.c
@@ -1596,10 +1596,8 @@ void MVM_interp_run(MVMThreadContext *tc, void (*initial_invoke)(MVMThreadContex
                     GET_REG(cur_op, 2).s);
                 cur_op += 4;
                 goto NEXT;
-            OP(flattenropes):
-                MVM_string_flatten(tc, GET_REG(cur_op, 0).s);
-                cur_op += 2;
-                goto NEXT;
+            OP(DEPRECATED_1):
+                MVM_exception_throw_adhoc(tc, "The flattenropes op was removed in MoarVM 2016.11.");
             OP(iscclass):
                 GET_REG(cur_op, 0).i64 = MVM_string_is_cclass(tc,
                     GET_REG(cur_op, 2).i64, GET_REG(cur_op, 4).s,

diff --git a/src/core/oplabels.h b/src/core/oplabels.h
@@ -236,7 +236,7 @@ static const void * const LABELS[] = {
     &&OP_rindexfrom,
     &&OP_escape,
     &&OP_flip,
-    &&OP_flattenropes,
+    &&OP_DEPRECATED_1,
     &&OP_iscclass,
     &&OP_findcclass,
     &&OP_findnotcclass,

diff --git a/src/core/oplist b/src/core/oplist
@@ -273,8 +273,7 @@ ordat               w(int64) r(str) r(int64) :pure
 rindexfrom          w(int64) r(str) r(str) r(int64) :pure
 escape              w(str) r(str) :pure
 flip                w(str) r(str) :pure
-# flattenropes will be DEPRECATED! (Use non-inplace indexingoptimized op)
-flattenropes        r(str)
+DEPRECATED_1        r(str)
 iscclass            w(int64) r(int64) r(str) r(int64) :pure
 findcclass          w(int64) r(int64) r(str) r(int64) r(int64) :pure
 findnotcclass       w(int64) r(int64) r(str) r(int64) r(int64) :pure

diff --git a/src/core/ops.c b/src/core/ops.c
@@ -2585,8 +2585,8 @@ static const MVMOpInfo MVM_op_infos[] = {
         { MVM_operand_write_reg | MVM_operand_str, MVM_operand_read_reg | MVM_operand_str }
     },
     {
-        MVM_OP_flattenropes,
-        "flattenropes",
+        MVM_OP_DEPRECATED_1,
+        "DEPRECATED_1",
         "  ",
         1,
         0,

diff --git a/src/core/ops.h b/src/core/ops.h
@@ -236,7 +236,7 @@
 #define MVM_OP_rindexfrom 232
 #define MVM_OP_escape 233
 #define MVM_OP_flip 234
-#define MVM_OP_flattenropes 235
+#define MVM_OP_DEPRECATED_1 235
 #define MVM_OP_iscclass 236
 #define MVM_OP_findcclass 237
 #define MVM_OP_findnotcclass 238

diff --git a/src/jit/graph.c b/src/jit/graph.c
@@ -304,7 +304,6 @@ static void * op_to_func(MVMThreadContext *tc, MVMint16 opcode) {
     case MVM_OP_read_fhs: return MVM_io_read_string;
 
     case MVM_OP_elems: return MVM_repr_elems;
-    case MVM_OP_flattenropes: return MVM_string_flatten;
     case MVM_OP_concat_s: return MVM_string_concatenate;
     case MVM_OP_repeat_s: return MVM_string_repeat;
     case MVM_OP_flip: return MVM_string_flip;
@@ -1890,13 +1889,6 @@ static MVMint32 jgb_consume_ins(MVMThreadContext *tc, JitGraphBuilder *jgb,
             jgb_append_primitive(tc, jgb, ins);
         break;
     }
-    case MVM_OP_flattenropes: {
-        MVMint32 target = ins->operands[0].reg.orig;
-        MVMJitCallArg args[] = { { MVM_JIT_INTERP_VAR, { MVM_JIT_INTERP_TC } },
-                                 { MVM_JIT_REG_VAL, { target } } };
-        jgb_append_call_c(tc, jgb, op_to_func(tc, op), 2, args, MVM_JIT_RV_VOID, -1);
-        break;
-    }
     case MVM_OP_hllize: {
         MVMint16 dst = ins->operands[0].reg.orig;
         MVMint16 src = ins->operands[1].reg.orig;