summaryrefslogtreecommitdiff
path: root/insns.def
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-05 15:56:48 (GMT)
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-05 15:56:48 (GMT)
commit7a0a58544452e6e01cf2ec87f83e7080d229dad5 (patch)
treea372d902b636cbcbc09c12bdbbbc5fa4f56e90e8 /insns.def
parent96f1c663779b434640c9c60f613566753ad17beb (diff)
revert r62655 for r63763
r63655 was tightly coupled to handle_frames and some assumptions seems to have been broken by r63763. To partially resolve Bug#14892, this reverts the optimization for now. I want to make MJIT CI happy first and then I'll probably retry r63655 by partially reverting r63763 for sp changes. The skipped test is not fixed yet. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r--insns.def44
1 files changed, 22 insertions, 22 deletions
diff --git a/insns.def b/insns.def
index 8c2f674..f608442 100644
--- a/insns.def
+++ b/insns.def
@@ -989,9 +989,9 @@ opt_plus
val = vm_opt_plus(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1008,9 +1008,9 @@ opt_minus
val = vm_opt_minus(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1027,9 +1027,9 @@ opt_mult
val = vm_opt_mult(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1046,9 +1046,9 @@ opt_div
val = vm_opt_div(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1065,9 +1065,9 @@ opt_mod
val = vm_opt_mod(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1084,9 +1084,9 @@ opt_eq
val = opt_eq_func(recv, obj, ci, cc);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1103,9 +1103,9 @@ opt_neq
val = vm_opt_neq(ci, cc, ci_eq, cc_eq, recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1122,9 +1122,9 @@ opt_lt
val = vm_opt_lt(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1141,9 +1141,9 @@ opt_le
val = vm_opt_le(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1160,9 +1160,9 @@ opt_gt
val = vm_opt_gt(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1179,9 +1179,9 @@ opt_ge
val = vm_opt_ge(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1198,9 +1198,9 @@ opt_ltlt
val = vm_opt_ltlt(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1217,9 +1217,9 @@ opt_aref
val = vm_opt_aref(recv, obj);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1236,10 +1236,10 @@ opt_aset
val = vm_opt_aset(recv, obj, set);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(obj);
PUSH(set);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1259,10 +1259,10 @@ opt_aset_with
val = tmp;
}
else {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(rb_str_resurrect(key));
PUSH(val);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1279,9 +1279,9 @@ opt_aref_with
val = vm_opt_aref_with(recv, key);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
PUSH(rb_str_resurrect(key));
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1298,8 +1298,8 @@ opt_length
val = vm_opt_length(recv, BOP_LENGTH);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1316,8 +1316,8 @@ opt_size
val = vm_opt_length(recv, BOP_SIZE);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1334,8 +1334,8 @@ opt_empty_p
val = vm_opt_empty_p(recv);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1352,8 +1352,8 @@ opt_succ
val = vm_opt_succ(recv);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1370,8 +1370,8 @@ opt_not
val = vm_opt_not(ci, cc, recv);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(recv);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);
@@ -1398,9 +1398,9 @@ opt_regexpmatch2
val = vm_opt_regexpmatch2(obj2, obj1);
if (val == Qundef) {
-#ifndef MJIT_HEADER
PUSH(obj2);
PUSH(obj1);
+#ifndef MJIT_HEADER
ADD_PC(-WIDTH_OF_opt_send_without_block);
#endif
DISPATCH_ORIGINAL_INSN(opt_send_without_block);