Skip to content

Commit 59f4c4a

Browse files
committed
8258075: Use auto variable declarations for enum iteration
Reviewed-by: jrose, ccheung
1 parent 330ce86 commit 59f4c4a

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

src/hotspot/share/ci/ciObjectFactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ void ciObjectFactory::init_shared_objects() {
123123

124124
{
125125
// Create the shared symbols, but not in _shared_ci_metadata.
126-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
126+
for (auto index : EnumRange<vmSymbolID>{}) {
127127
Symbol* vmsym = vmSymbols::symbol_at(index);
128128
assert(vmSymbols::find_sid(vmsym) == index, "1-1 mapping");
129129
ciSymbol* sym = new (_arena) ciSymbol(vmsym, index);
130130
init_ident_of(sym);
131131
_shared_ci_symbols[vmSymbols::as_int(index)] = sym;
132132
}
133133
#ifdef ASSERT
134-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
134+
for (auto index : EnumRange<vmSymbolID>{}) {
135135
Symbol* vmsym = vmSymbols::symbol_at(index);
136136
ciSymbol* sym = vm_symbol_at(index);
137137
assert(sym->get_symbol() == vmsym, "oop must match");

src/hotspot/share/classfile/classFileParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5302,7 +5302,7 @@ static void check_methods_for_intrinsics(const InstanceKlass* ik,
53025302
// The check is potentially expensive, therefore it is available
53035303
// only in debug builds.
53045304

5305-
for (vmIntrinsicID id : EnumRange<vmIntrinsicID>{}) {
5305+
for (auto id : EnumRange<vmIntrinsicID>{}) {
53065306
if (vmIntrinsics::_compiledLambdaForm == id) {
53075307
// The _compiledLamdbdaForm intrinsic is a special marker for bytecode
53085308
// generated for the JVM from a LambdaForm and therefore no method

src/hotspot/share/classfile/vmIntrinsics.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ void vmIntrinsics::init_vm_intrinsic_name_table() {
574574
const char** nt = &vm_intrinsic_name_table[0];
575575
char* string = (char*) &vm_intrinsic_name_bodies[0];
576576

577-
for (vmIntrinsicID index : EnumRange<vmIntrinsicID>{}) {
577+
for (auto index : EnumRange<vmIntrinsicID>{}) {
578578
nt[as_int(index)] = string;
579579
string += strlen(string); // skip string body
580580
string += 1; // skip trailing null
@@ -601,7 +601,7 @@ vmIntrinsics::ID vmIntrinsics::find_id(const char* name) {
601601
init_vm_intrinsic_name_table();
602602
}
603603

604-
for (vmIntrinsicID index : EnumRange<vmIntrinsicID>{}) {
604+
for (auto index : EnumRange<vmIntrinsicID>{}) {
605605
if (0 == strcmp(name, nt[as_int(index)])) {
606606
return index;
607607
}

src/hotspot/share/classfile/vmSymbols.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void vmSymbols::initialize(TRAPS) {
8383

8484
if (!UseSharedSpaces) {
8585
const char* string = &vm_symbol_bodies[0];
86-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
86+
for (auto index : EnumRange<vmSymbolID>{}) {
8787
Symbol* sym = SymbolTable::new_permanent_symbol(string);
8888
Symbol::_vm_symbols[as_int(index)] = sym;
8989
string += strlen(string); // skip string body
@@ -113,9 +113,9 @@ void vmSymbols::initialize(TRAPS) {
113113
#ifdef ASSERT
114114
// Check for duplicates:
115115

116-
for (vmSymbolID i1 : EnumRange<vmSymbolID>{}) {
116+
for (auto i1 : EnumRange<vmSymbolID>{}) {
117117
Symbol* sym = symbol_at(i1);
118-
for (vmSymbolID i2 : EnumRange<vmSymbolID>{vmSymbolID::FIRST_SID, i1}) {
118+
for (auto i2 : EnumRange<vmSymbolID>{vmSymbolID::FIRST_SID, i1}) {
119119
if (i2 != i1 && symbol_at(i2) == sym) {
120120
tty->print("*** Duplicate VM symbol SIDs %s(%d) and %s(%d): \"",
121121
vm_symbol_enum_name(i2), as_int(i2),
@@ -129,7 +129,7 @@ void vmSymbols::initialize(TRAPS) {
129129

130130
// Create an index for find_id:
131131
{
132-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
132+
for (auto index : EnumRange<vmSymbolID>{}) {
133133
vm_symbol_index[as_int(index)] = index;
134134
}
135135
int num_sids = SID_LIMIT-FIRST_SID;
@@ -150,7 +150,7 @@ void vmSymbols::initialize(TRAPS) {
150150
assert(symbol_at(sid) == jlo, "");
151151

152152
// Make sure find_sid produces the right answer in each case.
153-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
153+
for (auto index : EnumRange<vmSymbolID>{}) {
154154
Symbol* sym = symbol_at(index);
155155
sid = find_sid(sym);
156156
assert(sid == index, "symbol index works");
@@ -174,7 +174,7 @@ const char* vmSymbols::name_for(vmSymbolID sid) {
174174
if (sid == vmSymbolID::NO_SID)
175175
return "NO_SID";
176176
const char* string = &vm_symbol_bodies[0];
177-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
177+
for (auto index : EnumRange<vmSymbolID>{}) {
178178
if (index == sid)
179179
return string;
180180
string += strlen(string); // skip string body
@@ -187,7 +187,7 @@ const char* vmSymbols::name_for(vmSymbolID sid) {
187187

188188

189189
void vmSymbols::symbols_do(SymbolClosure* f) {
190-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
190+
for (auto index : EnumRange<vmSymbolID>{}) {
191191
f->do_symbol(&Symbol::_vm_symbols[as_int(index)]);
192192
}
193193
for (int i = 0; i < T_VOID+1; i++) {
@@ -196,7 +196,7 @@ void vmSymbols::symbols_do(SymbolClosure* f) {
196196
}
197197

198198
void vmSymbols::metaspace_pointers_do(MetaspaceClosure *closure) {
199-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
199+
for (auto index : EnumRange<vmSymbolID>{}) {
200200
closure->push(&Symbol::_vm_symbols[as_int(index)]);
201201
}
202202
for (int i = 0; i < T_VOID+1; i++) {
@@ -274,7 +274,7 @@ vmSymbolID vmSymbols::find_sid(const Symbol* symbol) {
274274
// Make sure this is the right answer, using linear search.
275275
// (We have already proven that there are no duplicates in the list.)
276276
vmSymbolID sid2 = vmSymbolID::NO_SID;
277-
for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
277+
for (auto index : EnumRange<vmSymbolID>{}) {
278278
Symbol* sym2 = symbol_at(index);
279279
if (sym2 == symbol) {
280280
sid2 = index;

src/hotspot/share/opto/compile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ void Compile::print_intrinsic_statistics() {
234234
if (total == 0) total = 1; // avoid div0 in case of no successes
235235
#define PRINT_STAT_LINE(name, c, f) \
236236
tty->print_cr(" %4d (%4.1f%%) %s (%s)", (int)(c), ((c) * 100.0) / total, name, f);
237-
for (vmIntrinsicID id : EnumRange<vmIntrinsicID>{}) {
237+
for (auto id : EnumRange<vmIntrinsicID>{}) {
238238
int flags = _intrinsic_hist_flags[as_int(id)];
239239
juint count = _intrinsic_hist_count[as_int(id)];
240240
if ((flags | count) != 0) {

src/hotspot/share/utilities/enumIterator.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
// Example:
6060
//
6161
// /* With range-base for (recommended) */
62-
// for (vmSymbolID index : EnumRange<vmSymbolID>{}) {
62+
// for (auto index : EnumRange<vmSymbolID>{}) {
6363
// ....
6464
// }
6565
//

0 commit comments

Comments
 (0)