diff src/share/vm/classfile/defaultMethods.cpp @ 12334:268e7a2178d7

Merge
author iveresov
date Thu, 03 Oct 2013 16:38:21 +0400
parents 36b97be47bde f2512d89ad0c
children cefad50507d8 ac9cb1d5a202 17cda06bcb7d
line wrap: on
line diff
--- a/src/share/vm/classfile/defaultMethods.cpp	Tue Oct 01 11:06:35 2013 -0400
+++ b/src/share/vm/classfile/defaultMethods.cpp	Thu Oct 03 16:38:21 2013 +0400
@@ -793,7 +793,7 @@
 
 
 
-#ifndef PRODUCT
+#ifdef ASSERT
 // Return true is broad type is a covariant return of narrow type
 static bool covariant_return_type(BasicType narrow, BasicType broad) {
   if (narrow == broad) {
@@ -804,7 +804,7 @@
   }
   return false;
 }
-#endif // ndef PRODUCT
+#endif
 
 static int assemble_redirect(
     BytecodeConstantPool* cp, BytecodeBuffer* buffer,
@@ -1095,4 +1095,3 @@
     MetadataFactory::free_array(cld, original_ordering);
   }
 }
-