1.1 --- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Thu Feb 18 16:15:28 2016 +0100
1.2 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Tue Mar 01 12:50:37 2016 +0530
1.3 @@ -1714,8 +1714,8 @@
1.4 Register Rtmp1 = noreg;
1.5
1.6 // check if it needs to be profiled
1.7 - ciMethodData* md;
1.8 - ciProfileData* data;
1.9 + ciMethodData* md = NULL;
1.10 + ciProfileData* data = NULL;
1.11
1.12 if (op->should_profile()) {
1.13 ciMethod* method = op->profiled_method();
1.14 @@ -1874,8 +1874,8 @@
1.15 CodeStub* stub = op->stub();
1.16
1.17 // check if it needs to be profiled
1.18 - ciMethodData* md;
1.19 - ciProfileData* data;
1.20 + ciMethodData* md = NULL;
1.21 + ciProfileData* data = NULL;
1.22
1.23 if (op->should_profile()) {
1.24 ciMethod* method = op->profiled_method();
1.25 @@ -2052,7 +2052,8 @@
1.26 case lir_cond_greater: acond = Assembler::greater; ncond = Assembler::lessEqual; break;
1.27 case lir_cond_belowEqual: acond = Assembler::belowEqual; ncond = Assembler::above; break;
1.28 case lir_cond_aboveEqual: acond = Assembler::aboveEqual; ncond = Assembler::below; break;
1.29 - default: ShouldNotReachHere();
1.30 + default: acond = Assembler::equal; ncond = Assembler::notEqual;
1.31 + ShouldNotReachHere();
1.32 }
1.33
1.34 if (opr1->is_cpu_register()) {
1.35 @@ -3237,27 +3238,23 @@
1.36 assert(default_type != NULL && default_type->is_array_klass() && default_type->is_loaded(), "must be true at this point");
1.37
1.38 int elem_size = type2aelembytes(basic_type);
1.39 - int shift_amount;
1.40 Address::ScaleFactor scale;
1.41
1.42 switch (elem_size) {
1.43 case 1 :
1.44 - shift_amount = 0;
1.45 scale = Address::times_1;
1.46 break;
1.47 case 2 :
1.48 - shift_amount = 1;
1.49 scale = Address::times_2;
1.50 break;
1.51 case 4 :
1.52 - shift_amount = 2;
1.53 scale = Address::times_4;
1.54 break;
1.55 case 8 :
1.56 - shift_amount = 3;
1.57 scale = Address::times_8;
1.58 break;
1.59 default:
1.60 + scale = Address::no_scale;
1.61 ShouldNotReachHere();
1.62 }
1.63
