# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1375724811 -7200
# Node ID 86af3ced0fce9f3b3634c5e8c011b006c2d8da46
# Parent  1e6d5dec4a4e05bb754b30d2c1a48efd75cfacb0# Parent  e36f7e4af7bfacbc5104b6d1543d10eddf9c8762
Merge.

diff -r 1e6d5dec4a4e -r 86af3ced0fce mx/commands.py
--- a/mx/commands.py	Mon Aug 05 13:20:06 2013 +0200
+++ b/mx/commands.py	Mon Aug 05 19:46:51 2013 +0200
@@ -998,6 +998,7 @@
             t = Task('BuildHotSpotVarieties')
             buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product'])
             buildvms(['--vms', 'server-nograal', '--builds', 'product'])
+            buildvms(['--vms', 'server-nograal', '--builds', 'optimized'])
             tasks.append(t.stop())
 
             for vmbuild in ['product', 'fastdebug']:
diff -r 1e6d5dec4a4e -r 86af3ced0fce src/share/vm/classfile/defaultMethods.cpp
--- a/src/share/vm/classfile/defaultMethods.cpp	Mon Aug 05 13:20:06 2013 +0200
+++ b/src/share/vm/classfile/defaultMethods.cpp	Mon Aug 05 19:46:51 2013 +0200
@@ -1316,7 +1316,7 @@
   return target;
 }
 
-#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) {
@@ -1327,7 +1327,7 @@
   }
   return false;
 }
-#endif // ndef PRODUCT
+#endif // def ASSERT
 
 static int assemble_redirect(
     BytecodeConstantPool* cp, BytecodeBuffer* buffer,