Allow to remove instanceof when remove exceptions #1710

NathanJPhillips · 2018-01-08T14:30:04Z

This removes the need to always run remove instanceof after remove exceptions and thus allows remove_instanceof to be moved to a function-pass

smowton

Looks reasonable; unsure if the restyle is necessary; if anybody objects to the churn I don't mind if commit no. 2 is dropped. The actual functional change seems fine.

NathanJPhillips · 2018-01-08T15:04:20Z

Agree about the restyle - I pulled it out into a separate commit specifically so it could be dropped. I did it a while ago and I'm not too fussed about it. I think it's a slight improvement because the passed iterator isn't actually used as an iterator so the new version is more declarative of intent. But it's not much different.

tautschnig

Looks good to me, just some questions.

tautschnig · 2018-01-08T15:13:12Z

src/goto-programs/remove_instanceof.cpp

@@ -28,16 +28,17 @@ class remove_instanceoft
    class_hierarchy(symbol_table);
  }

-  // Lower instanceof for a single functions
+  // Lower instanceof for a single function
  bool lower_instanceof(goto_programt &);


Question to compiler experts: is "lowering" a well-defined technical term? I would have used "translate" or "rewrite".

Yes, for example http://www.drdobbs.com/architecture-and-design/so-you-want-to-write-your-own-language/240165488?pgno=2 -- "rewriting more complex semantic constructs in terms of simpler ones", here "instanceof" in terms of classid equality comparisons.

Not that I consider Dr Dobbs an authoritative reference, but ok. But then you made me search and it seems that GCC and LLVM do use that terminology. So maybe not Dragon-book style, but apparently common in practice.

tautschnig · 2018-01-08T15:16:44Z

src/goto-programs/remove_exceptions.cpp

@@ -95,6 +96,7 @@ class remove_exceptionst
 protected:
  symbol_tablet &symbol_table;
  std::map<irep_idt, std::set<irep_idt>> &exceptions_map;
+  bool remove_instanceof;


How about changing this to run_remove_instanceof to avoid ambiguity?

I have renamed it to remove_added_instanceof to make clear that it only removes the instanceof calls that it adds itself rather than running remove_instanceof over the whole function.

tautschnig · 2018-01-08T15:17:55Z

src/goto-programs/remove_exceptions.h

+{
+  REMOVE_ADDED_INSTANCEOF,
+  DONT_REMOVE_INSTANCEOF,
+};


Is this more than a Boolean?

I favour keeping the enum since it makes the callsite clearer

Ok, makes sense, but might warrant a comment to clarify that that's the sole intent?

tautschnig · 2018-01-08T15:21:22Z

src/goto-programs/remove_exceptions.cpp

    const goto_programt::targett &,
    const stack_catcht &,
    const std::vector<exprt> &);

  void instrument_exceptions(
-    const goto_functionst::function_mapt::iterator &);
+    const irep_idt &function_id,
+    goto_functionst::goto_functiont &function);


Why is this not a goto_programt like all the others? At least I couldn't spot an obvious reason in the implementation.

tautschnig · 2018-01-08T15:23:20Z

@NathanJPhillips Thank you for putting all the re-style into a commit of its own!

This removes the need to always run remove instanceof after remove exceptions and allows remove_instanceof to be moved to a function-pass

smowton · 2018-01-09T10:47:57Z

@tautschnig happy for this to go in?

tautschnig · 2018-01-09T10:55:17Z

I'd love to see a comment clarifying the enum that is a glorified Boolean, but that's a wishlist item. So feel free to merge whenever you think it's good as it is (whether with or without that comment).

d190fd8 Merge remote-tracking branch 'upstream/develop' into pull-support-20180112 5bd5962 Merge pull request diffblue#1667 from romainbrenguier/feature/type_cast 8ecb55a Merge pull request diffblue#1717 from smowton/smowton/feature/remove_virtual_functions_per_function 0d7310a Merge pull request diffblue#1691 from romainbrenguier/bugfix/getClass#TG-1245 2064849 Use type_checked_cast in boolbv_width c5fc351 Validate data in pointer_typet in to_pointer_typet 35905c6 Add can_cast_type, validate_type for pointer_typet b72bacf Define type_try_dynamic_cast and type_checked_cast 23c3561 Unit test for string symbol resolution c13e602 Adding only needed equations in symbol resolution ae4deff Debug information for string equations 912828d JBMC: Run remove-virtual-functions as each function is converted a711c64 Introduce mechanism for renumbering an individual GOTO program e308a32 Merge pull request diffblue#1679 from NlightNFotis/nondet_extra_test e6ceb91 Merge pull request diffblue#1724 from tautschnig/fix-visitor ea74bed Add extra test for nondet-static flag and arrays 4f74896 Use irept API, not implementation-level API c55b4a5 Merge pull request diffblue#1682 from martin-cs/fix/dependence-graph-namespace-lifespan 1a2c14b Merge pull request diffblue#1722 from diffblue/unsafe_type_constructors 957a568 Merge pull request diffblue#1677 from NlightNFotis/pb4_develop 9c5add4 remove deprecated constructors for three bitvector types c96e02a no longer use deprecated constructors for some bitvector types 954060e Add unit test for has_subtype 3dd3877 Refactor has_char_pointer_subtype with has_subtype 4699c13 Extend symbol resolution to string_typet 74144fc Handle if_exprt in add_axioms_for_string_literal c6c1b3f Add an optional guard to add_axioms_for_constant 933d635 Merge pull request diffblue#1716 from mgudemann/fix/null_check_for_java_instanceof 1659314 Merge pull request diffblue#1715 from smowton/smowton/cleanup/jbmc_unused_passes 9c457b7 Add regression test for null instanceof. 2080cd3 Complete instanceof for Java. d4300d0 Merge pull request diffblue#1697 from diffblue/nondet_symbol_exprt 1c68dd4 Merge pull request diffblue#1714 from tautschnig/c-library-strcat 44b5bae Merge pull request diffblue#1698 from thomasspriggs/tg1633 c4304ba JBMC: Remove C-only passes bb8cfaa C library: Check upper bounds in memset, memcpy, memmove 7d4984f C library: Implement strcat, strncat 2a5cea2 This introduces nondet_symbol_exprt, which is generated by symbolic execution in response to side_effect_expr_nondett 85193a0 Merge pull request diffblue#1694 from NathanJPhillips/feature/add-raw-lhs-to-trace d9122dc Merge pull request diffblue#1710 from NathanJPhillips/feature/remove_instanceof_per_function 092df69 Switch from custom file / path routines to Boost-filesystem c8821b2 Allow to remove instanceof when remove exceptions 94b7658 Don't pass iterators into function calls a9c4e4f Added regression tests 76318ce Protect extended trace behind a command line option 69b0ff1 Added base_name in comments for all symbols e86080a Add raw LHS irep field to trace output ddd1b7a Add remove_instanceof overload to remove from a particular instruction 1c227b7 Merge pull request diffblue#1660 from smowton/smowton/fix/lazy_methods_array_parameters ae89c94 Lazy loading: assume concrete generic parameter types are needed 80eb6a6 TG-1877: Include array pointer types in needed classes 1053e5f Fix for [TG-1633] Inner generic types have incorrect type identifier e2cda1a Merge pull request diffblue#1704 from tautschnig/fix-copy-paste ef4a65e Fix op1/op0 copy&paste typo 21ea31f Merge pull request diffblue#1702 from peterschrammel/goto-diff-java c4bc953 Merge pull request diffblue#1701 from peterschrammel/allow-instrument-jdk 2811363 Java regression test for goto-diff 43d2e09 Also reset fresh temporary symbol counter 9ef28f4 Compare relative goto target offsets eaf3a7d Get source location from symbol table ab59659 Allow instrumentation of java.* and org.cprover.* 6fbd59c Merge pull request diffblue#1631 from tautschnig/fix-pointer-minus 7c04b5c Merge pull request diffblue#1699 from NathanJPhillips/feature/reset-main-in-tests 5e0f186 Pointer difference over void* is difference over char* faf8f00 Merge commit 'a83b52cddbed22304372c276512c63701eb3aedb' into pull-support-20180104 8236db4 Merge pull request diffblue#1419 from peterschrammel/refactor/cover-instrument a580e27 Merge pull request diffblue#1689 from smowton/smowton/feature/get_this 591511a Allow callers of load_java_class to pass the name of the main function 1b86b27 Merge pull request diffblue#1687 from smowton/smowton/feature/class-hierarchy-dot fd2bf6a Merge pull request diffblue#1688 from smowton/smowton/feature/parameter_indices f570ce5 Merge pull request diffblue#1696 from smowton/smowton/fix/identical_struct_equality 61b0d6d Merge pull request diffblue#1666 from mgudemann/bugfix/removed_required_virtual_calls 3365054 Add regression test 2b6dc8b Resolve concrete function call if no implementation is found 3f1fd64 Add code_typet::get_parameter_indices 42cf61a Fix testing for empty line in test desc file 2090000 Fix missing newline at end of desc file e448d5f Fix unsatisfiable test line f7f033d String smoke tests: ensure no type mismatches are seen b627c3d Replace unsound struct-cast simplification 8fa42b3 Class hierarchy: add DOT output, unit tests 04f2faf Mark GOTO instructions with unresolved virtual calls aac181f Pass command line options via optionst b6fa3e8 Factorize source location initialization 8da5395 Document cover functions a7f0c3d Introduce cover instrumenter 873627a Split cover into several files 0fc08f3 Replace cover-function-only by cover-include-pattern 1f2102c Add code_typet::get_this 2801f0f Avoid crashing when --dependence-graph is used by correcting namespace scoping. acac776 Add a test for the same-named static functions crashing dependence graph in the goto-analyser 05f46a9 Fix the problem where two static functions with the same name would cause the dependency graph to fail. git-subtree-dir: cbmc git-subtree-split: d190fd8

NathanJPhillips requested review from cesaro, kroening, mgudemann, peterschrammel, smowton and tautschnig as code owners January 8, 2018 14:30

smowton approved these changes Jan 8, 2018

View reviewed changes

Add remove_instanceof overload to remove from a particular instruction

ddd1b7a

NathanJPhillips force-pushed the feature/remove_instanceof_per_function branch from 6864355 to 6431d0d Compare January 8, 2018 15:07

tautschnig reviewed Jan 8, 2018

View reviewed changes

NathanJPhillips added 2 commits January 8, 2018 15:38

Don't pass iterators into function calls

94b7658

Allow to remove instanceof when remove exceptions

c8821b2

This removes the need to always run remove instanceof after remove exceptions and allows remove_instanceof to be moved to a function-pass

NathanJPhillips force-pushed the feature/remove_instanceof_per_function branch from 6431d0d to c8821b2 Compare January 8, 2018 15:39

smowton requested a review from chrisr-diffblue January 9, 2018 10:47

smowton merged commit d9122dc into diffblue:develop Jan 9, 2018

NathanJPhillips deleted the feature/remove_instanceof_per_function branch February 14, 2018 17:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow to remove instanceof when remove exceptions #1710

Allow to remove instanceof when remove exceptions #1710

NathanJPhillips commented Jan 8, 2018 •

edited

Loading

smowton left a comment

NathanJPhillips commented Jan 8, 2018

tautschnig left a comment

tautschnig Jan 8, 2018

smowton Jan 8, 2018

tautschnig Jan 8, 2018

tautschnig Jan 8, 2018

NathanJPhillips Jan 8, 2018 •

edited

Loading

tautschnig Jan 8, 2018

smowton Jan 8, 2018

tautschnig Jan 8, 2018

tautschnig Jan 8, 2018

tautschnig commented Jan 8, 2018

smowton commented Jan 9, 2018

tautschnig commented Jan 9, 2018

Allow to remove instanceof when remove exceptions #1710

Allow to remove instanceof when remove exceptions #1710

Conversation

NathanJPhillips commented Jan 8, 2018 • edited Loading

smowton left a comment

Choose a reason for hiding this comment

NathanJPhillips commented Jan 8, 2018

tautschnig left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NathanJPhillips Jan 8, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tautschnig commented Jan 8, 2018

smowton commented Jan 9, 2018

tautschnig commented Jan 9, 2018

NathanJPhillips commented Jan 8, 2018 •

edited

Loading

NathanJPhillips Jan 8, 2018 •

edited

Loading