- 
                Notifications
    
You must be signed in to change notification settings  - Fork 286
 
Extension of the call-graph and call-graph-based algorithms #641
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Merged
      
      
            peterschrammel
  merged 3 commits into
  diffblue:security-scanner-support
from
marek-trtik:CG_update_PR
  
      
      
   
  Mar 24, 2017 
      
    
  
     Merged
                    Changes from all commits
      Commits
    
    
            Show all changes
          
          
            3 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      
    File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      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
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| 
          
            
          
           | 
    @@ -6,10 +6,12 @@ Author: Daniel Kroening, [email protected] | |
| 
     | 
||
| \*******************************************************************/ | ||
| 
     | 
||
| #include "call_graph.h" | ||
| #include <util/std_expr.h> | ||
| #include <util/xml.h> | ||
| #include <algorithm> | ||
| #include <iterator> | ||
| 
     | 
||
| #include "call_graph.h" | ||
| 
     | 
||
| /*******************************************************************\ | ||
| 
     | 
||
| 
          
            
          
           | 
    @@ -70,11 +72,31 @@ void call_grapht::add( | |
| { | ||
| const exprt &function_expr=to_code_function_call(i_it->code).function(); | ||
| if(function_expr.id()==ID_symbol) | ||
| add(function, to_symbol_expr(function_expr).get_identifier()); | ||
| add(function, to_symbol_expr(function_expr).get_identifier(), {i_it}); | ||
| } | ||
| } | ||
| } | ||
| 
     | 
||
| /*******************************************************************\ | ||
| 
     | 
||
| Function: call_grapht::swap | ||
| 
     | 
||
| Inputs: | ||
| 
     | 
||
| Outputs: | ||
| 
     | 
||
| Purpose: | ||
| 
     | 
||
| \*******************************************************************/ | ||
| 
     | 
||
| void call_grapht::swap(call_grapht &other) | ||
| { | ||
| std::swap(graph, other.graph); | ||
| std::swap(map_from_edges_to_call_locations, | ||
| other.map_from_edges_to_call_locations); | ||
| } | ||
| 
     | 
||
| 
     | 
||
| /*******************************************************************\ | ||
| 
     | 
||
| Function: call_grapht::add | ||
| 
        
          
        
         | 
    @@ -96,7 +118,7 @@ void call_grapht::add( | |
| 
     | 
||
| /*******************************************************************\ | ||
| 
     | 
||
| Function: call_grapht::output_dot | ||
| Function: call_grapht::add | ||
| 
     | 
||
| Inputs: | ||
| 
     | 
||
| 
        
          
        
         | 
    @@ -106,37 +128,60 @@ Function: call_grapht::output_dot | |
| 
     | 
||
| \*******************************************************************/ | ||
| 
     | 
||
| void call_grapht::output_dot(std::ostream &out) const | ||
| void call_grapht::add( | ||
| const irep_idt &caller, | ||
| const irep_idt &callee, | ||
| const map_from_edges_to_call_locationst::mapped_type &call_sites) | ||
| { | ||
| out << "digraph call_graph {\n"; | ||
| 
     | 
||
| for(const auto &edge : graph) | ||
| bool exists=false; | ||
| const call_grapht::call_edges_ranget range=out_edges(caller); | ||
| for(auto it=range.first; it!=range.second; ++it) | ||
| { | ||
| out << " \"" << edge.first << "\" -> " | ||
| << "\"" << edge.second << "\" " | ||
| << " [arrowhead=\"vee\"];" | ||
| << "\n"; | ||
| if(it->second==callee) | ||
| { | ||
| exists=true; | ||
| break; | ||
| } | ||
| } | ||
| 
     | 
||
| out << "}\n"; | ||
| if(!exists) | ||
| add(caller, callee); | ||
| std::copy( | ||
| call_sites.cbegin(), call_sites.cend(), | ||
| std::back_inserter(map_from_edges_to_call_locations[{caller, callee}])); | ||
| } | ||
| 
     | 
||
| 
     | 
||
| void call_grapht::output_dot( | ||
| const goto_functionst &functions, | ||
| std::ostream &out) const | ||
| /*******************************************************************\ | ||
| 
     | 
||
| Function: call_grapht::output_dot | ||
| 
     | 
||
| Inputs: | ||
| 
     | 
||
| Outputs: | ||
| 
     | 
||
| Purpose: | ||
| 
     | 
||
| \*******************************************************************/ | ||
| 
     | 
||
| void call_grapht::output_dot(std::ostream &out) const | ||
| { | ||
| out << "digraph call_graph {\n"; | ||
| for(const auto &elem : functions.function_map) | ||
| out << " \"" << elem.first << "\";\n"; | ||
| for(grapht::const_iterator it=graph.begin(); | ||
| it!=graph.end(); | ||
| it++) | ||
| out << "digraph call_graph {\n" | ||
| << " node [fontsize=12 shape=box];\n"; | ||
| for(const auto &edge : graph) | ||
| { | ||
| out << " \"" << it->first << "\" -> " | ||
| << "\"" << it->second << "\" " | ||
| << " [arrowhead=\"vee\"];" | ||
| << "\n"; | ||
| out << " \"" << edge.first << "\" -> " | ||
| << "\"" << edge.second << "\" " | ||
| << " [label=\"{"; | ||
| bool first=true; | ||
| for(const auto instr_it : | ||
| get_map_from_edges_to_call_locations().at({edge.first, edge.second})) | ||
| { | ||
| if(!first) | ||
| out << ","; | ||
| out << instr_it->location_number; | ||
| first=false; | ||
| } | ||
| out << "}\"];\n"; | ||
| } | ||
| out << "}\n"; | ||
| } | ||
| 
          
            
          
           | 
    @@ -382,7 +427,10 @@ void compute_inverted_call_graph( | |
| { | ||
| assert(output_inverted_call_graph.graph.empty()); | ||
| for(const auto &elem : original_call_graph.graph) | ||
| output_inverted_call_graph.add(elem.second, elem.first); | ||
| output_inverted_call_graph.add( | ||
| elem.second, elem.first, | ||
| original_call_graph.get_map_from_edges_to_call_locations().at( | ||
| {elem.first, elem.second})); | ||
| } | ||
| 
     | 
||
| /*******************************************************************\ | ||
| 
          
            
          
           | 
    @@ -443,3 +491,91 @@ void find_leaves_below_function( | |
| std::unordered_set<irep_idt, dstring_hash> to_avoid; | ||
| find_leaves_below_function(call_graph, function, to_avoid, output); | ||
| } | ||
| 
     | 
||
| /*******************************************************************\ | ||
| 
     | 
||
| Function: find_direct_or_indirect_callees_of_function | ||
| 
     | 
||
| Inputs: | ||
| 
     | 
||
| Outputs: | ||
| 
     | 
||
| Purpose: | ||
| 
     | 
||
| \*******************************************************************/ | ||
| 
     | 
||
| void find_direct_or_indirect_callees_of_function( | ||
| const call_grapht &call_graph, | ||
| const irep_idt &function, | ||
| std::unordered_set<irep_idt, dstring_hash> &output) | ||
| { | ||
| std::unordered_set<irep_idt, dstring_hash> leaves; | ||
| find_leaves_below_function(call_graph, function, output, leaves); | ||
| output.insert(leaves.cbegin(), leaves.cend()); | ||
| } | ||
| 
     | 
||
| /*******************************************************************\ | ||
| 
     | 
||
| Function: find_nearest_common_callees | ||
| 
     | 
||
| Inputs: | ||
| 
     | 
||
| Outputs: | ||
| 
     | 
||
| Purpose: | ||
| 
     | 
||
| \*******************************************************************/ | ||
| 
     | 
||
| void find_nearest_common_callees( | ||
| const call_grapht &call_graph, | ||
| const std::set<irep_idt> &functions, | ||
| std::set<irep_idt> &output) | ||
| { | ||
| if(functions.empty()) | ||
| return; | ||
| if(functions.size()==1UL) | ||
| { | ||
| output.insert(*functions.cbegin()); | ||
| return; | ||
| } | ||
| 
     | 
||
| std::map<irep_idt, std::size_t> counting; | ||
| for(const auto &elem : call_graph.graph) | ||
| { | ||
| counting[elem.first]=0U; | ||
| counting[elem.second]=0U; | ||
| } | ||
| for(const auto &fn : functions) | ||
| { | ||
| std::unordered_set<irep_idt, dstring_hash> callees; | ||
| find_direct_or_indirect_callees_of_function(call_graph, fn, callees); | ||
| assert(callees.count(fn)==1U); | ||
| for(const auto &callee : callees) | ||
| ++counting[callee]; | ||
| } | ||
| 
     | 
||
| std::set<irep_idt> leaves; | ||
| for(const auto &elem : counting) | ||
| if(elem.second!=0U) | ||
| { | ||
| const call_grapht::call_edges_ranget range= | ||
| call_graph.out_edges(elem.first); | ||
| if(range.first==range.second) | ||
| leaves.insert(elem.first); | ||
| } | ||
| 
     | 
||
| for(auto &elem : counting) | ||
| if(leaves.count(elem.first)!=0UL) | ||
| output.insert(elem.first); | ||
| else if(elem.second!=0U && elem.second<functions.size()) | ||
| { | ||
| const call_grapht::call_edges_ranget range= | ||
| call_graph.out_edges(elem.first); | ||
| for(auto it=range.first; it!=range.second; ++it) | ||
| { | ||
| auto cit=counting.find(it->second); | ||
| if(cit->second==functions.size()) | ||
| output.insert(cit->first); | ||
| } | ||
| } | ||
| } | ||
  
    
      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
    
  
  
    
              
  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.
  
    
  
    
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the reason for not making this a member of call_grapht?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couple of years ago I read in one of Scott Mayer's books the following recommendation for clean OO design in C++: "When an algorithm can be effectively implemented using only the public interface on a class, then the algorithm should be implemented as a free function."
It makes sense to me (i.e. the intention to minimise a set of algorithms with the direct access to private data of the class maximises the encapsulation of that class, and so it simplifies definition and maintenance of class invariants), so I follow it. However, one can easily disagree. For example, it would be quite difficult to follow this recommendation in Java.
I am not sure whether you only asked the question or whether you actually want me to make it a member function. So, please, let me know...
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with that if these functions provide convenience functions for manipulating the object through the public interface. There might be more reasons for doing that, e.g. avoiding clutter, reducing class size, not being allowed to change the class, etc. Then these functions should even go into a separate "utility" module.
One could argue that this is mixing procedural and object-oriented styles, or that functions floating around in the root namespace are bad (which could be improved by actually using namespaces ;) , which is, however, a global change to be done to the whole code base).