Remove unnecessary uses of irep_id_hash #2093
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
owen-mc-diffblue
requested review from
cesaro,
chrisr-diffblue,
kroening,
martin-cs,
mgudemann,
peterschrammel,
smowton,
tautschnig and
thk123
as code owners
owen-mc-diffblue
force-pushed
the
owen-jones-diffblue/remove_unnecessary_irep_id_hash
branch
from
5f3303a to
1187e11
Compare
|
Could you please add "Fixes: #2090" to one of your commit messages? |
tautschnig
approved these changes
Apr 19, 2018
src/ansi-c/expr2c_class.h
Outdated
| std::unordered_map<irep_idt, | ||
| std::unordered_set<irep_idt, irep_id_hash>, | ||
| irep_id_hash> ns_collision; | ||
| std::unordered_map<irep_idt, std::unordered_set<irep_idt>, irep_id_hash> |
There was a problem hiding this comment.
I don't think you need the irep_id_hash here anymore.
| @@ -389,8 +388,8 @@ void code_contractst::operator()() | |||
| goto_functions.function_map.find(CPROVER_PREFIX "initialize"); | |||
| assert(i_it!=goto_functions.function_map.end()); | |||
|
|
|||
| for(id_sett::const_iterator it=summarized.begin(); | |||
| it!=summarized.end(); | |||
| for(std::unordered_set<irep_idt>::const_iterator it = summarized.begin(); | |||
There was a problem hiding this comment.
Possibly in a separate commit, but this should likely be changed to for(const auto &contract : summarized)
src/goto-instrument/dump_c.cpp
Outdated
| id_sett typedefs_done; | ||
| std::unordered_map<irep_idt, id_sett, irep_id_hash> | ||
| std::unordered_set<irep_idt> typedefs_done; | ||
| std::unordered_map<irep_idt, std::unordered_set<irep_idt>, irep_id_hash> |
| @@ -57,8 +57,7 @@ void find_used_functions( | |||
| goto_functionst &functions, | |||
| std::set<irep_idt> &seen) | |||
| { | |||
| std::pair<std::set<irep_idt>::const_iterator, bool> res = | |||
| seen.insert(start); | |||
| std::pair<std::set<irep_idt>::const_iterator, bool> res = seen.insert(start); | |||
There was a problem hiding this comment.
Nit pick: Looks like an unrelated whitespace change.
src/linking/linking.cpp
Outdated
| d_it!=needs_to_be_renamed.end(); | ||
| for(std::unordered_set<irep_idt>::const_iterator d_it = | ||
| needs_to_be_renamed.begin(); | ||
| d_it != needs_to_be_renamed.end(); |
There was a problem hiding this comment.
Possibly in a separate commit: std::stack<irep_idt> queue(needs_to_be_renamed.begin(), needs_to_be_renamed.end()); and ditch the for loop altogether.
There was a problem hiding this comment.
It seems that std::stack doesn't have a constructor like that. The solution seems to be to use std::deque instead.
src/linking/linking.cpp
Outdated
| d_it=u.begin(); | ||
| d_it!=u.end(); | ||
| for(std::unordered_set<irep_idt>::const_iterator d_it = u.begin(); | ||
| d_it != u.end(); |
There was a problem hiding this comment.
Possibly separate commit: for(const auto &dep : u)
src/linking/linking_class.h
Outdated
| typedef std::unordered_map<irep_idt, id_sett, irep_id_hash> used_byt; | ||
| typedef std::unordered_map<irep_idt, | ||
| std::unordered_set<irep_idt>, | ||
| irep_id_hash> |
added 2 commits
April 20, 2018 10:01
Also stop using typedefs for std::set<irep_idt> and std::unordered_set<irep_idt>. Fixes: diffblue#2090
|
The output of |
owen-mc-diffblue
force-pushed
the
owen-jones-diffblue/remove_unnecessary_irep_id_hash
branch
from
1187e11 to
471566c
Compare
owen-mc-diffblue
force-pushed
the
owen-jones-diffblue/remove_unnecessary_irep_id_hash
branch
from
471566c to
4840154
Compare
|
I may as well post the whole output of |
kroening
approved these changes
Apr 20, 2018
|
Thank you very much for the follow-up check! The only one that strikes me as problematic is |
tautschnig
approved these changes
Apr 20, 2018
owen-mc-diffblue
deleted the
owen-jones-diffblue/remove_unnecessary_irep_id_hash
branch
smowton
pushed a commit
to smowton/cbmc
that referenced
this pull request
May 9, 2018
31c47c2 Merge pull request diffblue#2113 from diffblue/java_new_array_data fb3025d Merge pull request diffblue#2107 from thk123/feature/TG-3271/interpreter-tracking-mock-exceptions 32bf48e Merge pull request diffblue#2105 from tautschnig/determinise-test 7254a2a show java_new_array_data side effects 0f1482c Merge pull request diffblue#2094 from smowton/smowton/fix/tmp-object-factory-prefix 3cfec66 Merge pull request diffblue#2106 from diffblue/ptrmember_on_array bf4c39c Merge pull request diffblue#1966 from JohnDumbell/JohnDumbell/Update-Assertion-Validation 74a37c6 Merge pull request diffblue#1988 from tautschnig/cadical 74dc576 Merge pull request diffblue#2003 from tautschnig/bitfield-offset 8916906 Merge pull request diffblue#2008 from tautschnig/section-bug 0bd83ab Extension to interpreter class a0ca0ba fix array->f typechecking e1f4120 Make virtual function resolution independent of string table entry ordering 714ccff Merge pull request diffblue#2072 from danpoe/feature/small-shared-two-way-ptr 16b6c20 Merge pull request diffblue#2046 from thk123/gs_tg2922 04cb909 Merge pull request diffblue#2102 from thk123/formatting/sort-includes-clang-format 7070ba1 Sort includes using clang-format 9874a6b Reformatting touched output function f2a4054 Remove redundant default constructor 54fb9ab Use format rather than from_expr for output 781bf7c Introduce exceptions for all conversion steps. 21997b2 Add documentation to convert_bitvector 015b284 Test demonstrating logging with clause for dealing with Windows 9d41b0c Disable nested exception printing for Windows b866015 Provide the original goto statement in the error a97bc28 Introduce throwing a guard conversion exception 12f25c2 Introduce throwing bv_conversion expection 9bd5222 Convert flatten_byte_extract to use structured exceptions 3207291 Introduce nested exception printing 35c4be7 Small shared two way pointer 7d247da Merge pull request diffblue#2099 from mgudemann/bugfix/build/glucose_syrup 1776a9e Merge pull request diffblue#1950 from romainbrenguier/refactor/prop_conv_straightforward 4147243 Change set_variable_name API to consume irep_idt 2d8be06 Rename `it` to pair in boolbvt::print_assignment 4365c28 Simplify boolbvt::set_to b18109f Make make_(free_)bv_expr return exprt 5724a35 Simplify loop in prop_conv::get 4987f3a Remove useless comments 13e87a9 Simplify dec_solve a0500f6 Use standard algorithm for finding an element ba13c94 Use auto for iterator types 9179571 Remove useless includes a905a07 Replace throws by invariant or preconditions 7db44fc Remove virtual keyword where not needed 990f33e Initialize at declaration instead of construction c1a93b3 Renaming `it` to symbol 8eb20f6 Use ranged for dc799e0 Assert replaced by unreachable c34e073 Add support for CaDiCaL 1bd9efd Merge pull request diffblue#2097 from peterschrammel/java-cleanup-replace a079f46 Clang-format moved file 2eb3714 Move replace_java_nondet to java_bytecode 9a8c292 Remove unnecessary include c8cf100 Remove Java refs from ANSI-C docs 0090952 Merge pull request diffblue#2096 from diffblue/cleanout-java aa3caa3 Fix CMake build for Glucose Syrup 1156930 Merge pull request diffblue#1244 from tautschnig/goto-gcc-at-fix 706e391 Merge pull request diffblue#2093 from owen-jones-diffblue/owen-jones-diffblue/remove_unnecessary_irep_id_hash 290feb4 Merge pull request diffblue#2095 from diffblue/get_json_stream_precondition ac2df21 Merge pull request diffblue#2027 from tautschnig/linking-multiple-conflicts dd0d602 Merge pull request diffblue#2030 from tautschnig/goto-cc-linux-kernel 42e58d4 Merge pull request diffblue#2085 from tautschnig/from_expr-cleanup 692f92d remove dependency on java_bytecode 8c6165d precondition for get_json_stream() e28a662 Remove unused typedef 5626fb7 Merge pull request diffblue#2092 from smowton/smowton/cleanup/diffblue-spelling 4840154 Replace stack by deque and use range-based for loop 987edbe Use range-based for loops 92ac82c Remove redundant irep_id_hash for unordered maps dc2b436 Remove redundant irep_id_hash for sets 5aa2c2d Attribute main function arguments to __CPROVER_start b7ef5af Merge pull request diffblue#2053 from owen-jones-diffblue/owen-jones-diffblue/bugfix/make-callgraph-include-uncalled-functions 252474f String tests: DiffBlue -> Diffblue de1915a Merge pull request diffblue#2074 from owen-jones-diffblue/owen-jones-diffblue/lazy-methods-no-candidate-callees d73f6bc Make directed callgraph include nodes with no edges 2a45e61 Only the top-level section should be considered for renaming 9c66a66 fixup! Support __attribute__((section("x")) e133964 C front-end: Section/ASM renaming also needs to be applied to aliases 0cfc72f Test --call-graph and --reachable-call-graph 1c34d22 Test lazy-loading when there are no candidates 289a439 Deal with virtual function calls with no candidate targets 9347615 Remove incorrect comment 18b1962 Fix order of parameters in function header 82058da Store virtual function calls instead of virtual call-sites 3653550 Use unordered set of irep_ids in ci_lazy_methods c31d43f Remove code duplication 945f885 Rename two variables and make one more local b7d70e7 Replace do-while loop with equally valid while loop 58b990d Use from_{expr,type} matching the language of the expression/type 177c8c1 goto-cc: support thin ar archives, refactoring e80008e goto-cc: support GCC's print-sysroot* options 38e6fa5 Accept the --build-id option in goto-ld f3bbb12 Linking: report multiple conflicts 495f109 Fixing member offset computation in presence of bitfields 5109eab Add @<file> arguments to the original command line 97d556e Update desc file to add pass variables. eea76ec Add a regression test. c14e907 Increase AssertionError arguments allowed from 2 to 3 git-subtree-dir: cbmc git-subtree-split: 31c47c2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#2082 means that we don't need to specify a hash function to
irep_idt. This PR removes unnecessary uses ofirep_id_hash. It also builds on #2075 and removes typedefs forstd::set<irep_idt>andstd::unordered_set<irep_idt>on the basis that they are now short enough to use directly.