148 Commits

Author SHA1 Message Date
Jeremy Manson
783155575c 8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
Reviewed-by: sla, dholmes
2014-01-08 08:34:02 +01:00
Harold Seigel
34329af386 8028520: JVM should not throw VerifyError when a private method overrides a final method
Exclude private methods when checking for final method override.

Reviewed-by: kamg, coleenp, dholmes, mseledtsov
2013-11-21 14:41:13 -05:00
Karen Kinnear
4b35aa3d1e 8027229: ICCE expected for >=2 maximally specific default methods
Need to process defaults for interfaces for invokespecial

Reviewed-by: lfoltan, hseigel, coleenp, jrose
2013-11-13 07:31:26 -08:00
Lana Steuck
c71f3cdbe6 Merge 2013-10-17 14:20:57 -07:00
Chris Hegarty
fafe7da1e5 Merge 2013-10-13 21:14:04 +01:00
Karen Kinnear
088ded71f9 8009130: Lambda: Fix access controls, loader constraints
New default methods list with inherited superinterface methods

Reviewed-by: minqi, sspitsyn, coleenp
2013-10-07 12:20:28 -04:00
Igor Veresov
51a9303c03 Merge 2013-10-03 16:38:21 +04:00
Vladimir Ivanov
02e57a0152 8025233: Move sun.invoke.Stable into java.lang.invoke package
Reviewed-by: twisti, iveresov
2013-10-02 06:17:10 -07:00
Karen Kinnear
71a3a55630 8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default
Reviewed-by: coleenp, bharadwaj, minqi
2013-10-01 08:10:42 -04:00
Niclas Adlertz
afef481831 Merge 2013-09-19 18:01:39 +02:00
David Chase
222c735458 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
Enhance method resolution and resulting data structures, plus some refactoring.

Reviewed-by: twisti, acorn, jrose
2013-09-13 22:38:02 -04:00
Zhengyu Gu
9e8f860fec Merge 2013-09-13 10:34:15 -04:00
Vladimir Ivanov
f0e77ac67f 8001107: @Stable annotation for constant folding of lazily evaluated variables
Co-authored-by: John Rose <john.r.rose@oracle.com>
Reviewed-by: rbackman, twisti, kvn
2013-09-10 14:51:48 -07:00
Harold Seigel
76033b1a37 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
Add checks for duplicates and issue errors when detected.

Reviewed-by: coleenp, zgu
2013-09-09 14:44:37 -04:00
Karen Kinnear
38560368c1 8012294: remove generic handling for default methods
Reviewed-by: kamg, coleenp
2013-08-26 11:35:25 -04:00
Ioi Lam
e412d7e8d1 8023683: Enhance class file parsing
Use the value returned by REALLOC_RESOURCE_ARRAY()

Reviewed-by: coleenp, ahgross
2013-08-24 00:14:46 -07:00
Chris Hegarty
e3149a4bcb Merge 2013-08-30 09:50:49 +01:00
Jiangli Zhou
553b498f51 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes
Change InstanceKlass::_source_file_name and _generic_signature to u2 fields.

Reviewed-by: coleenp, iklam
2013-08-19 14:59:54 -04:00
Chris Hegarty
856809eb94 Merge 2013-08-02 11:10:39 +01:00
Jiangli Zhou
3dfcb4125e 8020309: Eliminate InstanceKlass::_cached_class_file_len
Use JvmtiCachedClassFileData.

Reviewed-by: iklam, sspitsyn, dcubed
2013-07-17 18:06:29 -04:00
Harold Seigel
8379a071b6 8016256: Make finalization final
Add private methods to final methods check

Reviewed-by: coleenp, acorn, ahgross
2013-07-11 12:59:03 -04:00
Staffan Larsen
718f3252f6 8005849: JEP 167: Event-Based JVM Tracing
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Bengt Rutisson <bengt.rutisson@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Erik Gahlin <erik.gahlin@oracle.com>
Co-authored-by: Erik Helin <erik.helin@oracle.com>
Co-authored-by: Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>
Co-authored-by: Keith McGuigan <keith.mcguigan@oracle.com>
Co-authored-by: Mattias Tobiasson <mattias.tobiasson@oracle.com>
Co-authored-by: Markus Gronlund <markus.gronlund@oracle.com>
Co-authored-by: Mikael Auno <mikael.auno@oracle.com>
Co-authored-by: Nils Eliasson <nils.eliasson@oracle.com>
Co-authored-by: Nils Loodin <nils.loodin@oracle.com>
Co-authored-by: Rickard Backman <rickard.backman@oracle.com>
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Reviewed-by: acorn, coleenp, sla
2013-06-10 11:30:51 +02:00
Aleksey Shipilev
375e12feb9 8015270: @Contended: fix multiple issues in the layout code
Field count handling fixed, has_nonstatic_fields invariant fixed, oop map overrun fixed; new asserts

Reviewed-by: kvn, dcubed, coleenp
2013-05-27 12:49:08 -07:00
Coleen Phillimore
6ed8c8fcea 8003421: NPG: Move oops out of InstanceKlass into mirror
Inject protection_domain, signers, init_lock into java_lang_Class

Reviewed-by: stefank, dholmes, sla
2013-05-22 14:37:49 -04:00
Bharadwaj Yadavalli
19da55568f 8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
Restrict reference of interface methods by invokestatic and invokespecial to classfile version 52 or later.

Reviewed-by: kvn, hseigel
2013-05-21 16:17:51 -07:00
Aleksey Shipilev
a462587e4b 8014878: Clean up class field layout code
Rename/remove local variables, re-arrange instance_size calculation, more comments.

Reviewed-by: kvn, coleenp
2013-05-20 23:41:27 +04:00
Daniel D. Daugherty
9a6dfe1c55 Merge 2013-05-17 11:36:43 -07:00
Aleksey Shipilev
efe96b1343 8014509: @Contended: explicit default value behaves differently from the implicit value
Treat the empty string as the default value tag

Reviewed-by: kvn, twisti
2013-05-17 01:58:32 +04:00
Aleksey Shipilev
2fd72e202f 8012939: @Contended doesn't work correctly with inheritance
Fix instance_size miscalculation.

Reviewed-by: jrose, kvn
2013-05-17 01:43:48 +04:00
Christian Thalinger
c6c7f3439e Merge 2013-05-16 13:47:55 -07:00
Aleksey Shipilev
b3675a00d9 8014448: Purge PrintCompactFieldsSavings
Remove obsolete debugging code.

Reviewed-by: dholmes, kvn
2013-05-14 11:34:30 +04:00
Vladimir Kozlov
1763afaec5 Merge 2013-05-03 15:35:30 -07:00
Eric McCorkle
287d1c2caa 8007154: Remove support for u4 MethodParameter flags fields
Remove support for parsing class files with four-byte flags fields in MethodParameters attributes

Reviewed-by: jrose, coleenp
2013-04-26 07:34:02 -04:00
Gilles Duboscq
34da1742ef 8012292: optimized build with GCC broken
Some #ifndef PRODUCT should be #ifdef ASSERT

Reviewed-by: kvn, twisti
2013-04-24 14:26:09 +02:00
Bharadwaj Yadavalli
f63b13e379 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
Lambda changes; spec 0.6.2 - Allow static invokestatic and invokespecial calls to InterfaceMethod_ref

Reviewed-by: dholmes, acorn
2013-04-18 08:05:35 -07:00
Vladimir Ivanov
50821686b5 8011972: Field can be erroneously marked as contended when @Contended annotation isn't present
Reviewed-by: kvn, kmo, shade
2013-04-11 09:08:15 -07:00
Bharadwaj Yadavalli
70314e1b01 Merge 2013-03-29 20:52:01 -07:00
Harold Seigel
feec2af7b4 8009595: The UseSplitVerifier option needs to be deprecated
Put UseSplitVerifier option on the deprecated list.

Reviewed-by: dcubed, kmo, acorn
2013-03-26 09:06:16 -04:00
Christian Thalinger
6964a690ed 7198429: need checked categorization of caller-sensitive methods in the JDK
Reviewed-by: kvn, jrose
2013-03-25 17:13:26 -07:00
Coleen Phillimore
c5867cb71b 8003419: NPG: Clean up metadata created during class loading if failure
Store metadata on ClassFileParser instance to be cleaned up by destructor.  This enabled some refactoring of the enormous parseClassFile function.

Reviewed-by: jmasa, acorn
2013-03-13 17:34:29 -04:00
Aleksey Shipilev
2f5e08742a 8008965: @Contended fails with classes having static fields
Disable @Contended support for static fields

Reviewed-by: coleenp, kvn
2013-03-11 14:00:09 -04:00
Coleen Phillimore
faea95b8d3 8007320: NPG: move method annotations
Allocate method annotations and attach to ConstMethod if present

Reviewed-by: dcubed, jiangli, sspitsyn, iklam
2013-02-11 14:06:22 -05:00
Eric McCorkle
16990e896a 8006949: Update hotspot for MethodParameters format change
8006907: Hotspot should reject classfiles with multiple MethodParameters attributes

Update to Hotspot's processing of MethodParameters attributes in classfiles

Reviewed-by: coleenp, jrose
2013-02-04 13:05:32 -05:00
Krystal Mo
ae1a2f5e3c 8006758: LinkResolver assertion (caused by @Contended changes)
Treat anonymous classes as privileged code to restore the special handling for @Compiled during class file parsing

Reviewed-by: jrose, coleenp, kvn, dholmes
2013-01-24 02:03:38 -08:00
Bengt Rutisson
f3576a18a9 Merge 2013-01-18 11:03:15 +01:00
Stefan Karlsson
9d65c6d24f 8005994: Method annotations are allocated unnecessarily during class file parsing
Also reviewed by: vitalyd@gmail.com

Reviewed-by: coleenp, acorn
2013-01-15 10:09:45 +01:00
Coleen Phillimore
6972d9ff95 Merge 2013-01-14 08:37:14 -08:00
Eric Mccorkle
be0c8e9f08 8006005: Fix constant pool index validation and alignment trap for method parameter reflection
This patch addresses an alignment trap due to the storage format of method parameters data in constMethod.  It also adds code to validate constant pool indexes for method parameters data.

Reviewed-by: jrose, dholmes
2013-01-14 11:01:39 -05:00
Aleksey Shipilev
0614ed6542 8003985: Support @Contended Annotation - JEP 142
HotSpot changes to support @Contended annotation.

Reviewed-by: coleenp, kvn, jrose
2013-01-14 15:17:47 +01:00
Bharadwaj Yadavalli
8762d54e63 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
Fix verifier for new interface access flags

Reviewed-by: acorn, kvn
2013-01-09 11:39:30 -05:00