1.1 --- a/src/share/vm/adlc/archDesc.cpp Thu Feb 26 16:57:21 2009 -0800
1.2 +++ b/src/share/vm/adlc/archDesc.cpp Fri Feb 27 03:35:40 2009 -0800
1.3 @@ -1,5 +1,5 @@
1.4 //
1.5 -// Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
1.6 +// Copyright 1997-2009 Sun Microsystems, Inc. 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 @@ -436,10 +436,12 @@
1.11 if ((oper->_matrule) && (oper->_matrule->_lChild == NULL) &&
1.12 (oper->_matrule->_rChild == NULL)) {
1.13
1.14 - const Form *form = _globalNames[oper->_matrule->_opType];
1.15 - if ((form) && form->is_operand() &&
1.16 - (form->ideal_only() == false)) {
1.17 - add_chain_rule_entry(oper->_matrule->_opType, oper->cost(), oper->_ident);
1.18 + {
1.19 + const Form *form = _globalNames[oper->_matrule->_opType];
1.20 + if ((form) && form->is_operand() &&
1.21 + (form->ideal_only() == false)) {
1.22 + add_chain_rule_entry(oper->_matrule->_opType, oper->cost(), oper->_ident);
1.23 + }
1.24 }
1.25 // Check for additional chain rules
1.26 if (oper->_matrule->_next) {
1.27 @@ -1015,12 +1017,12 @@
1.28 int idealIndex = 0;
1.29 for (idealIndex = 1; idealIndex < _last_machine_leaf; ++idealIndex) {
1.30 const char *idealName = NodeClassNames[idealIndex];
1.31 - _idealIndex.Insert((void*)idealName, (void*)idealIndex);
1.32 + _idealIndex.Insert((void*) idealName, (void*) (intptr_t) idealIndex);
1.33 }
1.34 for ( idealIndex = _last_machine_leaf+1;
1.35 idealIndex < _last_opcode; ++idealIndex) {
1.36 const char *idealName = NodeClassNames[idealIndex];
1.37 - _idealIndex.Insert((void*)idealName, (void*)idealIndex);
1.38 + _idealIndex.Insert((void*) idealName, (void*) (intptr_t) idealIndex);
1.39 }
1.40
1.41 }
