--- old/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp	2018-04-24 15:41:22.635399000 +0200
+++ new/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp	2018-04-24 15:41:22.147364000 +0200
@@ -53,11 +53,18 @@
 
 // TODO: ARM - is it possible to inline these stubs into the main code stream?
 
+
 RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, LIR_Opr array)
-  : _throw_index_out_of_bounds_exception(array == NULL), _index(index), _array(array) {
-  _info = info == NULL ? NULL : new CodeEmitInfo(info);
+  : _throw_index_out_of_bounds_exception(false), _index(index), _array(array) {
+  assert(info != NULL, "must have info");
+  _info = new CodeEmitInfo(info);
 }
 
+RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index)
+  : _throw_index_out_of_bounds_exception(true), _index(index), _array(NULL) {
+  assert(info != NULL, "must have info");
+  _info = new CodeEmitInfo(info);
+}
 
 void RangeCheckStub::emit_code(LIR_Assembler* ce) {
   __ bind(_entry);