Skip to content

Commit 1b9987c

Browse files
Zhuojun Miaochhagedorn
Zhuojun Miao
authored andcommittedMay 30, 2022
8287288: Fix some typos in C1
Reviewed-by: aph, dholmes, dlong, chagedorn
1 parent 447ae00 commit 1b9987c

6 files changed

+13
-16
lines changed
 

‎src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_Patch
965965
if (UseCompressedOops && !wide) {
966966
__ ldrw(dest->as_register(), as_Address(from_addr));
967967
} else {
968-
__ ldr(dest->as_register(), as_Address(from_addr));
968+
__ ldr(dest->as_register(), as_Address(from_addr));
969969
}
970970
break;
971971
case T_METADATA:

‎src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,6 @@ void LIRGenerator::do_update_CRC32(Intrinsic* x) {
917917
assert(UseCRC32Intrinsics, "why are we here?");
918918
// Make all state_for calls early since they can emit code
919919
LIR_Opr result = rlock_result(x);
920-
int flags = 0;
921920
switch (x->id()) {
922921
case vmIntrinsics::_updateCRC32: {
923922
LIRItem crc(x->argument_at(0), this);
@@ -942,9 +941,9 @@ void LIRGenerator::do_update_CRC32(Intrinsic* x) {
942941

943942
LIR_Opr index = off.result();
944943
int offset = is_updateBytes ? arrayOopDesc::base_offset_in_bytes(T_BYTE) : 0;
945-
if(off.result()->is_constant()) {
944+
if (off.result()->is_constant()) {
946945
index = LIR_OprFact::illegalOpr;
947-
offset += off.result()->as_jint();
946+
offset += off.result()->as_jint();
948947
}
949948
LIR_Opr base_op = buf.result();
950949

@@ -994,7 +993,6 @@ void LIRGenerator::do_update_CRC32C(Intrinsic* x) {
994993
assert(UseCRC32CIntrinsics, "why are we here?");
995994
// Make all state_for calls early since they can emit code
996995
LIR_Opr result = rlock_result(x);
997-
int flags = 0;
998996
switch (x->id()) {
999997
case vmIntrinsics::_updateBytesCRC32C:
1000998
case vmIntrinsics::_updateDirectByteBufferCRC32C: {

‎src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ address TemplateInterpreterGenerator::generate_return_entry_for(TosState state,
466466
__ sub(rscratch1, rscratch2, rscratch1, ext::uxtw, 3);
467467
__ andr(sp, rscratch1, -16);
468468

469-
__ check_and_handle_popframe(rthread);
470-
__ check_and_handle_earlyret(rthread);
469+
__ check_and_handle_popframe(rthread);
470+
__ check_and_handle_earlyret(rthread);
471471

472472
__ get_dispatch();
473473
__ dispatch_next(state, step);

‎src/hotspot/share/c1/c1_LIR.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,14 @@ class LIR_Const: public LIR_OprPtr {
198198
class LIR_Opr {
199199
public:
200200
// value structure:
201-
// data opr-type opr-kind
202-
// +--------------+-------+-------+
203-
// [max...........|7 6 5 4|3 2 1 0]
204-
// ^
205-
// is_pointer bit
201+
// data other-non-data opr-type opr-kind
202+
// +-------------------+--------------+-------+-----+
203+
// [max...............................|6 5 4 3|2 1 0]
204+
// ^
205+
// is_pointer bit
206206
//
207207
// lowest bit cleared, means it is a structure pointer
208-
// we need 4 bits to represent types
208+
// we need 4 bits to represent types
209209

210210
private:
211211
friend class LIR_OprFact;

‎src/hotspot/share/c1/c1_LIRGenerator.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ void LIRGenerator::do_Return(Return* x) {
11871187
set_no_result(x);
11881188
}
11891189

1190-
// Examble: ref.get()
1190+
// Example: ref.get()
11911191
// Combination of LoadField and g1 pre-write barrier
11921192
void LIRGenerator::do_Reference_get(Intrinsic* x) {
11931193

@@ -1198,7 +1198,7 @@ void LIRGenerator::do_Reference_get(Intrinsic* x) {
11981198
LIRItem reference(x->argument_at(0), this);
11991199
reference.load_item();
12001200

1201-
// need to perform the null check on the reference objecy
1201+
// need to perform the null check on the reference object
12021202
CodeEmitInfo* info = NULL;
12031203
if (x->needs_null_check()) {
12041204
info = state_for(x);

‎src/hotspot/share/c1/c1_LIRGenerator.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,6 @@ class LIRItem: public CompilationResourceObj {
649649
} else {
650650
return _result;
651651
}
652-
return _result;
653652
}
654653

655654
void set_result(LIR_Opr opr);

0 commit comments

Comments
 (0)
Please sign in to comment.