Skip to content

Commit 0ac57ba

Browse files
author
Owen Jones
committed
Rename needed_methods to callable_methods
1 parent 9fef129 commit 0ac57ba

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/java_bytecode/ci_lazy_methods.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ bool ci_lazy_methodst::operator()(
113113
std::set<irep_idt> instantiated_classes;
114114

115115
{
116-
std::vector<irep_idt> initial_needed_methods;
116+
std::vector<irep_idt> initial_callable_methods;
117117
ci_lazy_methods_neededt initial_lazy_methods(
118-
initial_needed_methods,
118+
initial_callable_methods,
119119
instantiated_classes,
120120
symbol_table);
121121
initialize_instantiated_classes(
@@ -124,8 +124,8 @@ bool ci_lazy_methodst::operator()(
124124
initial_lazy_methods);
125125
method_worklist2.insert(
126126
method_worklist2.end(),
127-
initial_needed_methods.begin(),
128-
initial_needed_methods.end());
127+
initial_callable_methods.begin(),
128+
initial_callable_methods.end());
129129
}
130130

131131
std::set<irep_idt> methods_already_populated;

src/java_bytecode/ci_lazy_methods_needed.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Author: Chris Smowton, [email protected]
2020
void ci_lazy_methods_neededt::add_needed_method(
2121
const irep_idt &method_symbol_name)
2222
{
23-
needed_methods.push_back(method_symbol_name);
23+
callable_methods.push_back(method_symbol_name);
2424
}
2525

2626
/// Notes class `class_symbol_name` will be instantiated, or a static field

src/java_bytecode/ci_lazy_methods_needed.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class ci_lazy_methods_neededt
2020
{
2121
public:
2222
ci_lazy_methods_neededt(
23-
std::vector<irep_idt> &_needed_methods,
23+
std::vector<irep_idt> &_callable_methods,
2424
std::set<irep_idt> &_instantiated_classes,
2525
symbol_tablet &_symbol_table):
26-
needed_methods(_needed_methods),
26+
callable_methods(_callable_methods),
2727
instantiated_classes(_instantiated_classes),
2828
symbol_table(_symbol_table)
2929
{}
@@ -33,12 +33,12 @@ class ci_lazy_methods_neededt
3333
bool add_needed_class(const irep_idt &);
3434

3535
private:
36-
// needed_methods is a vector because it's used as a work-list
36+
// callable_methods is a vector because it's used as a work-list
3737
// which is periodically cleared. It can't be relied upon to
3838
// contain all methods that have previously been elaborated.
3939
// It should be changed to a set if we develop the need to use
4040
// it that way.
41-
std::vector<irep_idt> &needed_methods;
41+
std::vector<irep_idt> &callable_methods;
4242
// instantiated_classes on the other hand is a true set of every class
4343
// found so far, so we can use a membership test to avoid
4444
// repeatedly exploring a class hierarchy.

0 commit comments

Comments
 (0)