Mercurial > hg > graal-compiler
changeset 11199:86af3ced0fce
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 19:46:51 +0200 |
parents | 1e6d5dec4a4e (current diff) e36f7e4af7bf (diff) |
children | 380e0248f873 |
files | |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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']:
--- 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,