From 744830cb242c82c4637e6fb303b36d0371c84979 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 10 Sep 2024 21:25:15 +0000 Subject: Revert "riscv64: Add node Rol, fix InstructionBuilder" This reverts commit 39927bc359ccbe65371213c4559126b05dcfb117. Reason for revert: Failure on bot with: error: Statement could not be matched starting from line 1089612 TestRotate.java:95: rol {{a\d+}}, {{a\d+}}, {{a\d+}} ISA_FEATURES = {'rv64gcv_zba_zbb_zbs': True} READ_BARRIER_TYPE = baker 567-checker-builder-intrinsics FAILED: [run-test:1074] CFG checker failed $ ssh -q -F /b/s/w/ir/cache/builder/art/test/testrunner/ssh_config -p 10001 ubuntu@localhost "rm -rf /home/ubuntu/art-test-chroot/data/run-test/test-343039" 567-checker-builder-intrinsics files deleted from host and from target ---------- test-art-target-run-test-ndebug-prebuild-optimizing-no-relocate-ntrace-cms-checkjni-picimage-ndebuggable-no-jvmti-567-checker-builder-intrinsics64 Change-Id: Ic1fd87c331c9eba315af6c98c3ad393766327417 --- compiler/optimizing/nodes.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing/nodes.cc') diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 32ae89eeea..588f4d7ce2 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -1829,7 +1829,7 @@ HConstant* HBinaryOperation::TryStaticEvaluation(HInstruction* left, HInstructio } else if (left->IsLongConstant()) { if (right->IsIntConstant()) { // The binop(long, int) case is only valid for shifts and rotations. - DCHECK(IsShl() || IsShr() || IsUShr() || IsRol() || IsRor()) << DebugName(); + DCHECK(IsShl() || IsShr() || IsUShr() || IsRor()) << DebugName(); return Evaluate(left->AsLongConstant(), right->AsIntConstant()); } else if (right->IsLongConstant()) { return Evaluate(left->AsLongConstant(), right->AsLongConstant()); -- cgit v1.2.3-59-g8ed1b