changeset 9422:e578f653a10d

8077364: "if( !this )" construct prevents build on Xcode 6.3 Reviewed-by: stefank, simonis
author sla
date Wed, 15 Apr 2015 09:34:46 +0200
parents 705e62002289
children f3c619e4afb1
files src/share/vm/adlc/formssel.cpp src/share/vm/libadt/set.cpp src/share/vm/opto/chaitin.cpp
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/adlc/formssel.cpp	Wed Jan 27 07:57:32 2021 +0000
+++ b/src/share/vm/adlc/formssel.cpp	Wed Apr 15 09:34:46 2015 +0200
@@ -3396,7 +3396,7 @@
 // Count occurrences of operands names in the leaves of the instruction
 // match rule.
 void MatchNode::count_instr_names( Dict &names ) {
-  if( !this ) return;
+  if( this == NULL ) return;
   if( _lChild ) _lChild->count_instr_names(names);
   if( _rChild ) _rChild->count_instr_names(names);
   if( !_lChild && !_rChild ) {
--- a/src/share/vm/libadt/set.cpp	Wed Jan 27 07:57:32 2021 +0000
+++ b/src/share/vm/libadt/set.cpp	Wed Apr 15 09:34:46 2015 +0200
@@ -66,7 +66,7 @@
 // The caller must deallocate the string.
 char *Set::setstr() const
 {
-  if( !this ) return os::strdup("{no set}");
+  if( this == NULL ) return os::strdup("{no set}");
   Set &set = clone();           // Virtually copy the basic set.
   set.Sort();                   // Sort elements for in-order retrieval
 
--- a/src/share/vm/opto/chaitin.cpp	Wed Jan 27 07:57:32 2021 +0000
+++ b/src/share/vm/opto/chaitin.cpp	Wed Apr 15 09:34:46 2015 +0200
@@ -2084,7 +2084,7 @@
 // Dump a register name into a buffer.  Be intelligent if we get called
 // before allocation is complete.
 char *PhaseChaitin::dump_register( const Node *n, char *buf  ) const {
-  if( !this ) {                 // Not got anything?
+  if( this == NULL ) {          // Not got anything?
     sprintf(buf,"N%d",n->_idx); // Then use Node index
   } else if( _node_regs ) {
     // Post allocation, use direct mappings, no LRG info available