Mercurial > hg > truffle
comparison src/share/vm/classfile/classFileParser.cpp @ 18027:9f169829d0e1
Merge
| author | asaha |
|---|---|
| date | Tue, 08 Jul 2014 13:25:13 -0700 |
| parents | f73af4455d7d ae92351815b6 |
| children | 52b4284cb496 ccfff14361ea 72fa1e83e5f9 |
comparison
equal
deleted
inserted
replaced
| 18026:6e4bd4c906dc | 18027:9f169829d0e1 |
|---|---|
| 4036 | 4036 |
| 4037 this_klass->set_minor_version(minor_version); | 4037 this_klass->set_minor_version(minor_version); |
| 4038 this_klass->set_major_version(major_version); | 4038 this_klass->set_major_version(major_version); |
| 4039 this_klass->set_has_default_methods(has_default_methods); | 4039 this_klass->set_has_default_methods(has_default_methods); |
| 4040 | 4040 |
| 4041 if (!host_klass.is_null()) { | |
| 4042 assert (this_klass->is_anonymous(), "should be the same"); | |
| 4043 this_klass->set_host_klass(host_klass()); | |
| 4044 } | |
| 4045 | |
| 4041 // Set up Method*::intrinsic_id as soon as we know the names of methods. | 4046 // Set up Method*::intrinsic_id as soon as we know the names of methods. |
| 4042 // (We used to do this lazily, but now we query it in Rewriter, | 4047 // (We used to do this lazily, but now we query it in Rewriter, |
| 4043 // which is eagerly done for every method, so we might as well do it now, | 4048 // which is eagerly done for every method, so we might as well do it now, |
| 4044 // when everything is fresh in memory.) | 4049 // when everything is fresh in memory.) |
| 4045 if (Method::klass_id_for_intrinsics(this_klass()) != vmSymbols::NO_SID) { | 4050 if (Method::klass_id_for_intrinsics(this_klass()) != vmSymbols::NO_SID) { |