1.1 --- a/src/share/vm/opto/type.hpp Fri Jun 15 15:37:35 2018 +0000
1.2 +++ b/src/share/vm/opto/type.hpp Mon Jun 18 14:39:46 2018 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -130,17 +130,17 @@
1.11
1.12 private:
1.13 typedef struct {
1.14 - const TYPES dual_type;
1.15 - const BasicType basic_type;
1.16 - const char* msg;
1.17 - const bool isa_oop;
1.18 - const int ideal_reg;
1.19 - const relocInfo::relocType reloc;
1.20 + TYPES dual_type;
1.21 + BasicType basic_type;
1.22 + const char* msg;
1.23 + bool isa_oop;
1.24 + uint ideal_reg;
1.25 + relocInfo::relocType reloc;
1.26 } TypeInfo;
1.27
1.28 // Dictionary of types shared among compilations.
1.29 static Dict* _shared_type_dict;
1.30 - static TypeInfo _type_info[];
1.31 + static const TypeInfo _type_info[];
1.32
1.33 static int uhash( const Type *const t );
1.34 // Structural equality check. Assumes that cmp() has already compared
1.35 @@ -407,7 +407,7 @@
1.36
1.37 // Mapping from compiler type to VM BasicType
1.38 BasicType basic_type() const { return _type_info[_base].basic_type; }
1.39 - int ideal_reg() const { return _type_info[_base].ideal_reg; }
1.40 + uint ideal_reg() const { return _type_info[_base].ideal_reg; }
1.41 const char* msg() const { return _type_info[_base].msg; }
1.42 bool isa_oop_ptr() const { return _type_info[_base].isa_oop; }
1.43 relocInfo::relocType reloc() const { return _type_info[_base].reloc; }
