equal
deleted
inserted
replaced
281 // This #if condition should be in sync with the areCustomLoadersSupportedForCDS |
281 // This #if condition should be in sync with the areCustomLoadersSupportedForCDS |
282 // method in test/lib/jdk/test/lib/Platform.java. |
282 // method in test/lib/jdk/test/lib/Platform.java. |
283 error("AppCDS custom class loaders not supported on this platform"); |
283 error("AppCDS custom class loaders not supported on this platform"); |
284 #endif |
284 #endif |
285 |
285 |
286 assert(UseAppCDS, "must be"); |
|
287 if (!is_super_specified()) { |
286 if (!is_super_specified()) { |
288 error("If source location is specified, super class must be also specified"); |
287 error("If source location is specified, super class must be also specified"); |
289 } |
288 } |
290 if (!is_id_specified()) { |
289 if (!is_id_specified()) { |
291 error("If source location is specified, id must be also specified"); |
290 error("If source location is specified, id must be also specified"); |
381 } |
380 } |
382 } |
381 } |
383 } else { |
382 } else { |
384 // If "source:" tag is specified, all super class and super interfaces must be specified in the |
383 // If "source:" tag is specified, all super class and super interfaces must be specified in the |
385 // class list file. |
384 // class list file. |
386 if (UseAppCDS) { |
385 klass = load_class_from_source(class_name_symbol, CHECK_NULL); |
387 klass = load_class_from_source(class_name_symbol, CHECK_NULL); |
|
388 } |
|
389 } |
386 } |
390 |
387 |
391 if (klass != NULL && klass->is_instance_klass() && is_id_specified()) { |
388 if (klass != NULL && klass->is_instance_klass() && is_id_specified()) { |
392 InstanceKlass* ik = InstanceKlass::cast(klass); |
389 InstanceKlass* ik = InstanceKlass::cast(klass); |
393 int id = this->id(); |
390 int id = this->id(); |