Skip to content

Commit dcfe657

Browse files
committed
Test: Re-enable some yul equivalence tests
1 parent e737a5f commit dcfe657

File tree

1 file changed

+1
-51
lines changed

1 file changed

+1
-51
lines changed

test/EVM/Equivalence/EquivalenceTests.hs

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -466,16 +466,10 @@ yulOptimizationsSolcTests = testCase "eq-all-yul-optimization-tests" $ do
466466

467467
-- Takes too long, would timeout on most test setups.
468468
-- We could probably fix these by "bunching together" queries
469-
, "reasoningBasedSimplifier/mulmod.yul"
470469
, "loadResolver/multi_sload_loop.yul"
471-
, "reasoningBasedSimplifier/mulcheck.yul"
472-
, "reasoningBasedSimplifier/smod.yul"
473470
, "fullSuite/abi_example1.yul"
474-
, "fullInliner/large_function_multi_use.yul"
475471
, "loadResolver/merge_known_write_with_distance.yul"
476472
, "loadResolver/second_mstore_with_delta.yul"
477-
, "rematerialiser/for_continue_2.yul"
478-
, "rematerialiser/for_continue_with_assignment_in_post.yul"
479473

480474
-- invalid test --
481475
-- https://github.com/ethereum/solidity/issues/9500
@@ -485,12 +479,7 @@ yulOptimizationsSolcTests = testCase "eq-all-yul-optimization-tests" $ do
485479
-- stack too deep --
486480
, "fullSuite/abi2.yul"
487481
, "fullSuite/aztec.yul"
488-
, "stackCompressor/inlineInBlock.yul"
489-
, "stackCompressor/inlineInFunction.yul"
490482
, "stackCompressor/unusedPrunerWithMSize.yul"
491-
, "wordSizeTransform/function_call.yul"
492-
, "fullInliner/no_inline_into_big_function.yul"
493-
, "controlFlowSimplifier/switch_only_default.yul"
494483
, "stackLimitEvader" -- all that are in this subdirectory
495484

496485
-- typed yul --
@@ -528,60 +517,21 @@ yulOptimizationsSolcTests = testCase "eq-all-yul-optimization-tests" $ do
528517
-- New: symbolic index on MSTORE/MLOAD/CopySlice/CallDataCopy/ExtCodeCopy/Revert,
529518
-- or exponent is symbolic (requires symbolic gas)
530519
-- or SHA3 offset symbolic
531-
, "blockFlattener/basic.yul"
532-
, "commonSubexpressionEliminator/case2.yul"
533520
, "equalStoreEliminator/indirect_inferrence.yul"
534-
, "expressionJoiner/reassignment.yul"
535521
, "expressionSimplifier/exp_simplifications.yul"
536-
, "expressionSimplifier/zero_length_read.yul"
537-
, "expressionSimplifier/side_effects_in_for_condition.yul"
538-
, "fullSuite/create_and_mask.yul"
539522
, "fullSuite/unusedFunctionParameterPruner_return.yul"
540523
, "fullSuite/unusedFunctionParameterPruner_simple.yul"
541524
, "fullSuite/unusedFunctionParameterPruner.yul"
542-
, "loadResolver/double_mload_with_other_reassignment.yul"
543-
, "loadResolver/double_mload_with_reassignment.yul"
544-
, "loadResolver/double_mload.yul"
545-
, "loadResolver/keccak_reuse_basic.yul"
546-
, "loadResolver/keccak_reuse_expr_mstore.yul"
547-
, "loadResolver/keccak_reuse_msize.yul"
548-
, "loadResolver/keccak_reuse_mstore.yul"
549-
, "loadResolver/keccak_reuse_reassigned_branch.yul"
550-
, "loadResolver/keccak_reuse_reassigned_value.yul"
551525
, "loadResolver/keccak_symbolic_memory.yul"
552526
, "loadResolver/merge_mload_with_known_distance.yul"
553-
, "loadResolver/mload_self.yul"
554-
, "loadResolver/keccak_reuse_in_expression.yul"
555527
, "loopInvariantCodeMotion/complex_move.yul"
556-
, "loopInvariantCodeMotion/move_memory_function.yul"
557-
, "loopInvariantCodeMotion/move_state_function.yul"
558528
, "loopInvariantCodeMotion/no_move_memory.yul"
559529
, "loopInvariantCodeMotion/no_move_storage.yul"
560-
, "loopInvariantCodeMotion/not_first.yul"
561-
, "ssaAndBack/single_assign_if.yul"
562-
, "ssaAndBack/single_assign_switch.yul"
563-
, "structuralSimplifier/switch_inline_no_match.yul"
564-
, "unusedFunctionParameterPruner/simple.yul"
565-
, "unusedStoreEliminator/covering_calldatacopy.yul"
566530
, "unusedStoreEliminator/remove_before_revert.yul"
567-
, "unusedStoreEliminator/unknown_length2.yul"
568531
, "unusedStoreEliminator/unrelated_relative.yul"
569532
, "fullSuite/extcodelength.yul"
570533
, "unusedStoreEliminator/create_inside_function.yul"-- "trying to reset symbolic storage with writes in create"
571-
572-
-- Due to tstorage warnings treated as errors when running solc with --standard-json
573-
-- these cannot be currently run. See: https://github.com/ethereum/solidity/issues/15397
574-
-- When that fix comes to upstream, we can re-enabled again
575-
, "equalStoreEliminator/transient_storage.yul"
576-
, "unusedStoreEliminator/tload.yul"
577-
, "unusedStoreEliminator/tstore.yul"
578-
, "fullSuite/transient_storage.yul"
579-
, "unusedPruner/transient_storage.yul"
580-
581-
-- Bug in solidity, fixed in newer versions:
582-
-- https://github.com/ethereum/solidity/issues/15397#event-14116827816
583-
, "no_move_transient_storage.yul"
584-
534+
585535
-- to investigate, currently crash
586536
, "commonSubexpressionEliminator/long_literals_as_builtin_args.yul"
587537
, "disambiguator/string_as_hex_and_hex_as_string.yul"

0 commit comments

Comments
 (0)