*** old/src/share/vm/classfile/verificationType.hpp	Wed Aug 31 13:57:45 2016
--- new/src/share/vm/classfile/verificationType.hpp	Wed Aug 31 13:57:43 2016

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2003, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 93,103 ****
--- 93,104 ----
        Category1          = (Category1Flag     << 1 * BitsPerByte) | Primitive,
        Category2          = (Category2Flag     << 1 * BitsPerByte) | Primitive,
        Category2_2nd      = (Category2_2ndFlag << 1 * BitsPerByte) | Primitive,
  
        // Primitive values (type descriminator stored in most-signifcant bytes)
        Bogus              = (ITEM_Bogus      << 2 * BitsPerByte) | Category1,
+       // Bogus needs the " | Primitive".  Else, is_reference(Bogus) returns TRUE.
+       Bogus              = (ITEM_Bogus      << 2 * BitsPerByte) | Primitive,
        Boolean            = (ITEM_Boolean    << 2 * BitsPerByte) | Category1,
        Byte               = (ITEM_Byte       << 2 * BitsPerByte) | Category1,
        Short              = (ITEM_Short      << 2 * BitsPerByte) | Category1,
        Char               = (ITEM_Char       << 2 * BitsPerByte) | Category1,
        Integer            = (ITEM_Integer    << 2 * BitsPerByte) | Category1,