Mercurial > hg > truffle
comparison src/share/vm/classfile/classFileParser.cpp @ 20528:f0bedf980c65
Merge
author | asaha |
---|---|
date | Tue, 16 Sep 2014 13:55:38 -0700 |
parents | 8cb56c8cb30d 47e3110c47e8 |
children | 8e15758b2e94 |
comparison
equal
deleted
inserted
replaced
20527:8cb56c8cb30d | 20528:f0bedf980c65 |
---|---|
4140 check_illegal_static_method(this_klass, CHECK_(nullHandle)); | 4140 check_illegal_static_method(this_klass, CHECK_(nullHandle)); |
4141 } | 4141 } |
4142 } | 4142 } |
4143 | 4143 |
4144 // Allocate mirror and initialize static fields | 4144 // Allocate mirror and initialize static fields |
4145 java_lang_Class::create_mirror(this_klass, protection_domain, CHECK_(nullHandle)); | 4145 java_lang_Class::create_mirror(this_klass, class_loader, protection_domain, |
4146 | 4146 CHECK_(nullHandle)); |
4147 | 4147 |
4148 // Generate any default methods - default methods are interface methods | 4148 // Generate any default methods - default methods are interface methods |
4149 // that have a default implementation. This is new with Lambda project. | 4149 // that have a default implementation. This is new with Lambda project. |
4150 if (has_default_methods ) { | 4150 if (has_default_methods ) { |
4151 DefaultMethods::generate_default_methods( | 4151 DefaultMethods::generate_default_methods( |