Mercurial > hg > truffle

comparison src/share/vm/classfile/classFileParser.cpp @ 1513:df736661d0c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jrose
date Tue, 11 May 2010 15:19:19 -0700
parents f03d0a26bf83 cd5dbf694d45
children c18cbe5936b8 086d73ccd6c0
comparison
equal deleted inserted replaced
1496:e8e83be27dd7 1513:df736661d0c8
1836 signature() == vmSymbols::void_method_signature() && 1836 signature() == vmSymbols::void_method_signature() &&
1837 m->is_vanilla_constructor()) { 1837 m->is_vanilla_constructor()) {
1838 _has_vanilla_constructor = true; 1838 _has_vanilla_constructor = true;
1839 } 1839 }
1840 1840
1841 if (EnableMethodHandles && m->is_method_handle_invoke()) { 1841 if (EnableMethodHandles && (m->is_method_handle_invoke() ||
1842 m->is_method_handle_adapter())) {
1842 THROW_MSG_(vmSymbols::java_lang_VirtualMachineError(), 1843 THROW_MSG_(vmSymbols::java_lang_VirtualMachineError(),
1843 "Method handle invokers must be defined internally to the VM", nullHandle); 1844 "Method handle invokers must be defined internally to the VM", nullHandle);
1844 } 1845 }
1845 1846
1846 return m; 1847 return m;