--- old/src/share/vm/c1/c1_GraphBuilder.cpp	2017-03-15 16:57:38.835118506 -0400
+++ new/src/share/vm/c1/c1_GraphBuilder.cpp	2017-03-15 16:57:37.519042411 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4260,11 +4260,15 @@
   if (is_store) {
     Value value = args->at(2);
     Instruction* store = append(new StoreIndexed(array, index, NULL, T_CHAR, value, state_before, false, true));
+#ifndef ASSERT
     store->set_flag(Instruction::NeedsRangeCheckFlag, false);
+#endif
     _memory->store_value(value);
   } else {
     Instruction* load = append(new LoadIndexed(array, index, NULL, T_CHAR, state_before, true));
+#ifndef ASSERT
     load->set_flag(Instruction::NeedsRangeCheckFlag, false);
+#endif
     push(load->type(), load);
   }
 }