comparison src/share/vm/classfile/defaultMethods.cpp @ 23660:b5f3a471e646

Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 01 Jun 2016 00:11:44 +0200
parents dd9cc155639c 32b682649973
children
comparison
equal deleted inserted replaced
23411:d7cf78885a3a 23660:b5f3a471e646
1 /* 1 /*
2 * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
890 mt, CHECK_NULL); 890 mt, CHECK_NULL);
891 891
892 m->set_constants(NULL); // This will get filled in later 892 m->set_constants(NULL); // This will get filled in later
893 m->set_name_index(cp->utf8(name)); 893 m->set_name_index(cp->utf8(name));
894 m->set_signature_index(cp->utf8(sig)); 894 m->set_signature_index(cp->utf8(sig));
895 #ifdef CC_INTERP
896 ResultTypeFinder rtf(sig); 895 ResultTypeFinder rtf(sig);
897 m->set_result_index(rtf.type()); 896 m->constMethod()->set_result_type(rtf.type());
898 #endif
899 m->set_size_of_parameters(params); 897 m->set_size_of_parameters(params);
900 m->set_max_stack(max_stack); 898 m->set_max_stack(max_stack);
901 m->set_max_locals(params); 899 m->set_max_locals(params);
902 m->constMethod()->set_stackmap_data(NULL); 900 m->constMethod()->set_stackmap_data(NULL);
903 m->set_code(code_start); 901 m->set_code(code_start);