609 Commits

Author SHA1 Message Date
Daniel D. Daugherty
05b3bc59c3 Merge 2013-03-23 22:35:02 -07:00
Karen Kinnear
cfb7431cca 8010017: lambda: reflection get(Declared)Methods support for default methods
Don't expose vm generated overpass (bridges to default methods).

Reviewed-by: dholmes, fparain
2013-03-20 11:43:56 -04:00
Bill Pittore
f5f5775dc3 8005716: Enhance JNI specification to allow support of static JNI libraries in Embedded JREs
Reviewed-by: dlong, alanb, mduigou
2013-03-15 15:20:40 -04:00
Joseph Provino
a68c69fd65 Merge 2013-03-08 12:35:18 -05:00
Joseph Provino
e1f180f82e 8006498: #if <symbol> is wrong in the code
ASSERT and other symbols used incorrectly with #if are supposed to be defined or not.

Reviewed-by: dholmes, mikael
2013-03-06 13:46:55 -05:00
Daniel D. Daugherty
776841b1bc 8007476: assert(the_owner != NULL) failed: Did not find owning Java thread for lock word address
Make deadlock detection a little more robust in the case of being unable to find the JavaThread associated with an object lock.

Reviewed-by: sla, acorn
2013-02-27 15:00:30 -08:00
Mikael Vidstedt
960480c53d 8008081: Print outs do not have matching arguments
Corrected formatted prints to have matching arguments, removed dead print_frame_layout function

Reviewed-by: sla, dholmes
2013-02-26 08:54:03 -08:00
Eric McCorkle
b56b3bc9aa 8007153: Ensure that MethodParameters API works properly with RedefineClasses
Adds code to HotSpot to properly update MethodParameter attributes' constant pool indexes when redefineClasses is called

Reviewed-by: coleenp, sspitsyn
2013-02-19 11:36:52 -05:00
Vladimir Ivanov
8952875c84 Merge 2013-02-14 05:36:59 -08:00
Igor Ignatyev
034705ee13 8006683: Add WhiteBox API to testing of compiler
Reviewed-by: kvn, vlivanov
2013-02-13 08:29:04 -08: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
Zhengyu Gu
ee53020f94 Merge 2013-02-08 16:56:03 -08:00
Zhengyu Gu
ef59a25f71 8006691: Remove jvm_version_info.is_kernel_jvm field
Removed is_kernel_jvm from jvm_version_info as Kernel VM has been deprecated

Reviewed-by: mchung, coleenp
2013-02-08 16:31:48 -05:00
Serguei Spitsyn
6ff685b4c8 Merge 2013-02-08 09:14:06 -08:00
Bill Pittore
9cad40fca6 Merge 2013-02-07 16:05:48 -05:00
Daniel D. Daugherty
8ef946f380 7182152: Instrumentation hot swap test incorrect monitor count
Add/refine new tracing support using -XX:TraceRedefineClasses=16384.

Reviewed-by: coleenp, acorn, sspitsyn
2013-02-06 14:31:37 -08: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
Christian Tornqvist
2195d1d5e4 Merge 2013-02-02 07:24:29 +01:00
Christian Tornqvist
111ddcc827 8005012: Add WB APIs to better support NMT testing
Add WB API functions to enable better NMT testing

Reviewed-by: dholmes, zgu
2013-02-01 23:48:08 +01:00
Serguei Spitsyn
932c29e08e 8006731: JSR 292: the VM_RedefineClasses::rewrite_cp_refs_in_method() must support invokedynamic
The invokedynamic bytecode ref to a CP entry needs to be checked and fixed as well.

Reviewed-by: coleenp, twisti
2013-01-31 20:11:14 -08:00
Serguei Spitsyn
823c749bd1 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
Need a support for invokedynamic entry kinds when new and old constant pools are merged.

Reviewed-by: coleenp, twisti
2013-01-31 20:07:18 -08:00
Bharadwaj Yadavelli
cb255a0269 8004967: Default method cause VerifyError: Illegal use of nonvirtual
Recognize VM generated method in old verifier

Reviewed-by: acorn, coleenp
2013-01-28 10:55:30 -05:00
Dean Long
0a2347e0ba Merge 2013-01-27 01:07:09 -08:00
Yumin Qi
fe8363948e Merge 2013-01-25 13:47:52 -08:00
Zhengyu Gu
fc0efc91c8 8000692: Remove old KERNEL code
Removed depreciated kernel VM source code from hotspot VM

Reviewed-by: dholmes, acorn
2013-01-25 10:04:08 -05:00
Serguei Spitsyn
020fe75e67 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
When constant pool is copied in merge_constant_pools the invokedynamic operands must be copied before.

Reviewed-by: coleenp, twisti
2013-01-24 22:13:32 -08:00
Joseph Provino
698fba94ef 8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS.

Reviewed-by: coleenp, stefank
2013-01-23 13:02:39 -05:00
Coleen Phillimore
99039568f9 8006040: NPG: on_stack processing wastes space in ConstantPool
Added on_stack bit to flags.  Also MetadataMarkOnStack is used for more than JVMTI so had to be moved.

Reviewed-by: dholmes, stefank
2013-01-23 10:34:29 -05:00
Karen Kinnear
706efde6df Merge 2013-01-21 16:11:24 -05:00
Bengt Rutisson
f3576a18a9 Merge 2013-01-18 11:03:15 +01:00
Coleen Phillimore
e508ba9b0b 7174978: NPG: Fix bactrace builder for class redefinition
Remove Method* from backtrace but save version so redefine classes doesn't give inaccurate line numbers.  Removed old Merlin API with duplicate code.

Reviewed-by: dholmes, sspitsyn
2013-01-17 13:40:31 -05:00
Karen Kinnear
4ce43bafa5 Merge 2013-01-16 18:23:37 -05: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
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
Dean Long
f1bd82ba8f Merge 2013-01-09 21:18:52 -05:00
Eric Mccorkle
be968245ec 8004728: Add hotspot support for parameter reflection
Add hotspot support for parameter reflection

Reviewed-by: acorn, jrose, coleenp
2013-01-08 14:01:36 -05:00
Jiangli Zhou
8d91f983e0 8001341: SIGSEGV in methodOopDesc::fast_exception_handler_bci_for(KlassHandle,int,Thread*)+0x3e9
Use methodHandle.

Reviewed-by: coleenp, acorn, twisti, sspitsyn
2013-01-08 13:01:19 -05:00
Coleen Phillimore
64499d9494 8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
Relocate functions with jsr's when rewriting so not repeated after reading shared archive

Reviewed-by: twisti, jrose
2013-01-02 20:28:09 -05:00
Yumin Qi
a5fbc1aa4d Merge 2012-12-24 11:46:38 -08:00
Joel Borggren-Franck
6ed6cb5375 8004823: Add VM support for type annotation reflection
Reviewed-by: dholmes, coleenp
2012-12-20 10:22:19 +01:00
Aleksey Shipilev
4c293ebcd6 8004318: JEP-171: Support Unsafe fences intrinsics
Add three memory-ordering intrinsics to the sun.misc.Unsafe class.

Reviewed-by: twisti, kvn
2012-12-18 17:37:44 -08:00
Christian Thalinger
40a871f3e9 8003238: JSR 292: intermittent exception failure with java/lang/invoke/CallSiteTest.java
Reviewed-by: jrose, kvn
2012-12-14 12:06:42 -08:00
John Cuthbertson
6c0bf79f7a Merge 2012-11-30 12:01:34 -08:00
Coleen Phillimore
7aa43fc5d8 8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
Add ClassLoaderData object for each anonymous class with metaspaces to allocate in.

Reviewed-by: twisti, jrose, stefank
2012-11-29 16:50:29 -05:00
John Cuthbertson
defec7ae16 Merge 2012-11-29 11:23:15 -08:00
Coleen Phillimore
6538c5134b 8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
Make metaspace::contains be lock free and used to see if something is in metaspace, also compare Method* with vtbl pointer.

Reviewed-by: dholmes, sspitsyn, dcubed, jmasa
2012-11-28 17:50:21 -05:00
Mikael Vidstedt
8c32bcb315 8003879: Duplicate definitions in vmStructs
Removed duplicate entries

Reviewed-by: dholmes, sspitsyn
2012-11-27 07:57:57 -08:00
Stefan Karlsson
57204d9f34 8003935: Simplify the needed includes for using Thread::current()
Reviewed-by: dholmes, rbackman, coleenp
2012-11-27 14:20:21 +01:00
Mikael Vidstedt
5791b1f1c3 8003690: Example code in JVMTI GetStackTrace documentation is broken
Fixed to minor errors in example code

Reviewed-by: sspitsyn, dholmes
2012-11-21 09:02:13 -08:00
Coleen Phillimore
ddec2a3aed Merge 2012-11-16 09:19:12 -05:00