Patch to fix build breakage with GCC 4.7

[Deepak Bhole]

Hi,

HotSpot currently fails to build with GCC 4.7 due to 2 points where it
is using boolean rather than NULL. GCC 4.6 treated it as a warning --
4.7 treats it as an error.

Attached patch fixes the issue and makes it build again.

Please feel free to commit if OK, or let me know if it needs re-work.

Cheers,
Deepak
-------------- next part --------------
diff -up openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp.sav openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp
--- openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp.sav	2012-01-27 13:55:15.486395713 -0500
+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp	2012-01-27 13:55:32.531114310 -0500
@@ -269,7 +269,7 @@ klassOop constantPoolOopDesc::klass_ref_
 methodOop constantPoolOopDesc::method_at_if_loaded(constantPoolHandle cpool,
                                                    int which, Bytecodes::Code invoke_code) {
   assert(!constantPoolCacheOopDesc::is_secondary_index(which), "no indy instruction here");
-  if (cpool->cache() == NULL)  return false;  // nothing to load yet
+  if (cpool->cache() == NULL)  return NULL;  // nothing to load yet
   int cache_index = which - CPCACHE_INDEX_TAG;
   if (!(cache_index >= 0 && cache_index < cpool->cache()->length())) {
     if (PrintMiscellaneous && (Verbose||WizardMode)) {
diff -up openjdk/hotspot/src/share/vm/opto/loopnode.cpp.sav openjdk/hotspot/src/share/vm/opto/loopnode.cpp
--- openjdk/hotspot/src/share/vm/opto/loopnode.cpp.sav	2012-01-27 13:55:43.251937313 -0500
+++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp	2012-01-27 13:55:53.546767356 -0500
@@ -893,7 +893,7 @@ Node *LoopLimitNode::Identity( PhaseTran
 Node* CountedLoopNode::match_incr_with_optional_truncation(
                       Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) {
   // Quick cutouts:
-  if (expr == NULL || expr->req() != 3)  return false;
+  if (expr == NULL || expr->req() != 3)  return NULL;
 
   Node *t1 = NULL;
   Node *t2 = NULL;