--- a/src/hotspot/share/oops/typeArrayOop.inline.hpp	Fri Feb 23 09:38:33 2018 +0100
+++ b/src/hotspot/share/oops/typeArrayOop.inline.hpp	Fri Feb 23 12:47:36 2018 +0100
@@ -104,7 +104,7 @@
 }
 inline void typeArrayOopDesc::bool_at_put(int which, jboolean contents) {
   ptrdiff_t offset = element_offset<jboolean>(T_BOOLEAN, which);
-  HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, ((jint)contents) & 1);
+  HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, jboolean(contents & 1));
 }
 
 inline jchar typeArrayOopDesc::char_at(int which) const {
@@ -130,7 +130,7 @@
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::short_at_put(int which, jshort contents) {
-  ptrdiff_t offset = element_offset<jshort>(T_BOOLEAN, which);
+  ptrdiff_t offset = element_offset<jshort>(T_SHORT, which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/gtest/oops/test_typeArrayOop.cpp	Fri Feb 23 12:47:36 2018 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "memory/universe.hpp"
+#include "oops/oop.inline.hpp"
+#include "oops/typeArrayOop.inline.hpp"
+#include "unittest.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+TEST_VM(typeArrayOopDesc, bool_at_put) {
+  char mem[100];
+  memset(mem, 0, ARRAY_SIZE(mem));
+
+  char* addr = align_up(mem, 16);
+
+  typeArrayOop o = (typeArrayOop) addr;
+  o->set_klass(Universe::boolArrayKlassObj());
+  o->set_length(10);
+
+
+  ASSERT_EQ((jboolean)0, o->bool_at(0));
+  ASSERT_EQ((jboolean)0, o->bool_at(1));
+  ASSERT_EQ((jboolean)0, o->bool_at(2));
+  ASSERT_EQ((jboolean)0, o->bool_at(3));
+  ASSERT_EQ((jboolean)0, o->bool_at(4));
+  ASSERT_EQ((jboolean)0, o->bool_at(5));
+  ASSERT_EQ((jboolean)0, o->bool_at(6));
+  ASSERT_EQ((jboolean)0, o->bool_at(7));
+
+  o->bool_at_put(3, 255); // Check for masking store.
+  o->bool_at_put(2, 1);
+  o->bool_at_put(1, 1);
+  o->bool_at_put(0, 1);
+
+  ASSERT_EQ((jboolean)1, o->bool_at(0));
+  ASSERT_EQ((jboolean)1, o->bool_at(1));
+  ASSERT_EQ((jboolean)1, o->bool_at(2));
+  ASSERT_EQ((jboolean)1, o->bool_at(3));
+  ASSERT_EQ((jboolean)0, o->bool_at(4));
+  ASSERT_EQ((jboolean)0, o->bool_at(5));
+  ASSERT_EQ((jboolean)0, o->bool_at(6));
+  ASSERT_EQ((jboolean)0, o->bool_at(7));
+}