Revert "Make constant assignments more conforming to JIS X 3017:2013 11.4.2.2.3"

This reverts commit 44caca11cfa6bea01a1ef738846183f1a56d5658.

The change caused a build failure.
http://ci.rvm.jp/results/trunk-vm-asserts@silicon-docker/2102153

2 files changed, 8 insertions, 21 deletions

diff --git a/compile.c b/compile.c
index 928a95b985..80dc5e729a 100644
--- a/compile.c
+++ b/compile.c
@@ -6855,26 +6855,21 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	break;
       }
       case NODE_CDECL:{
-        ID base_id;
+	CHECK(COMPILE(ret, "lvalue", node->nd_value));
+
+	if (!popped) {
+	    ADD_INSN(ret, line, dup);
+	}
+
 	if (node->nd_vid) {
 	    ADD_INSN1(ret, line, putspecialobject,
 		      INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-            base_id = node->nd_vid;
+	    ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_vid));
 	}
 	else {
 	    compile_cpath(ret, iseq, node->nd_else);
-            base_id = node->nd_else->nd_mid;
+	    ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_else->nd_mid));
 	}
-        CHECK(COMPILE(ret, "lvalue", node->nd_value));
-
-        if (popped) {
-            ADD_INSN(ret, line, swap);
-        } else {
-            ADD_INSN(ret, line, dup);
-            ADD_INSN1(ret, line, reverse, INT2FIX(3));
-        }
-
-        ADD_INSN1(ret, line, setconstant, ID2SYM(base_id));
 	break;
       }
       case NODE_CVASGN:{
diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb
index fa512aa437..8784e0e988 100644
--- a/test/ruby/test_const.rb
+++ b/test/ruby/test_const.rb
@@ -69,12 +69,4 @@ PRE
   def test_toplevel_lookup
     assert_raise(NameError, '[Feature #11547]') {TestConst::Object}
   end
-
-  def test_evaluation_order
-    assert_raise_with_message(RuntimeError, "recv", 'JIS X 3017:2013 11.4.2.2.3') {
-      eval <<~EOS
-        raise('recv')::C = raise('value')
-      EOS
-    }
-  end
 end