@@ -109,17 +109,17 @@ static bool lt_index(
109
109
return a.var .index <b.var .index ;
110
110
}
111
111
static bool lt_startpc (
112
- const local_variable_with_holest* a,
113
- const local_variable_with_holest* b)
112
+ const local_variable_with_holest * a,
113
+ const local_variable_with_holest * b)
114
114
{
115
115
return a->var .start_pc <b->var .start_pc ;
116
116
}
117
117
118
118
// The predecessor map, and a top-sorting comparator:
119
119
120
120
typedef std::map<
121
- local_variable_with_holest*,
122
- std::set<local_variable_with_holest*> >
121
+ local_variable_with_holest *,
122
+ std::set<local_variable_with_holest *> >
123
123
predecessor_mapt;
124
124
125
125
struct is_predecessor_oft
@@ -129,8 +129,8 @@ struct is_predecessor_oft
129
129
explicit is_predecessor_oft (const predecessor_mapt &_order) : order(_order) {}
130
130
131
131
bool operator ()(
132
- local_variable_with_holest* a,
133
- local_variable_with_holest* b) const
132
+ local_variable_with_holest * a,
133
+ local_variable_with_holest * b) const
134
134
{
135
135
auto findit=order.find (a);
136
136
if (findit==order.end ())
@@ -483,7 +483,7 @@ static void populate_live_range_holes(
483
483
const std::set<local_variable_with_holest *> &merge_vars,
484
484
unsigned expanded_live_range_start)
485
485
{
486
- std::vector<local_variable_with_holest*> sorted_by_startpc (
486
+ std::vector<local_variable_with_holest *> sorted_by_startpc (
487
487
merge_vars.begin (), merge_vars.end ());
488
488
std::sort (sorted_by_startpc.begin (), sorted_by_startpc.end (), lt_startpc);
489
489
@@ -591,7 +591,7 @@ void java_bytecode_convert_methodt::find_initialisers_for_slot(
591
591
// Build a simple map from instruction PC to the variable
592
592
// live in this slot at that PC, and a map from each variable
593
593
// to variables that flow into it:
594
- std::vector<local_variable_with_holest*> live_variable_at_address;
594
+ std::vector<local_variable_with_holest *> live_variable_at_address;
595
595
populate_variable_address_map (firstvar, varlimit, live_variable_at_address);
596
596
597
597
// Now find variables that flow together by
@@ -612,14 +612,14 @@ void java_bytecode_convert_methodt::find_initialisers_for_slot(
612
612
// Take the transitive closure of the predecessor map:
613
613
for (auto &kv : predecessor_map)
614
614
{
615
- std::set<local_variable_with_holest*> closed_preds;
615
+ std::set<local_variable_with_holest *> closed_preds;
616
616
gather_transitive_predecessors (kv.first , predecessor_map, closed_preds);
617
617
kv.second =std::move (closed_preds);
618
618
}
619
619
620
620
// Top-sort so that we get the bottom variables first:
621
621
is_predecessor_oft comp (predecessor_map);
622
- std::vector<local_variable_with_holest*> topsorted_vars;
622
+ std::vector<local_variable_with_holest *> topsorted_vars;
623
623
for (auto it=firstvar, itend=varlimit; it!=itend; ++it)
624
624
topsorted_vars.push_back (&*it);
625
625
0 commit comments