367 Commits

Author SHA1 Message Date
Volker Simonis
76fa595599 8008959: Fix non-PCH build on Linux, Windows and MacOS X
Fix the build without precompiled headers by either including the missing ".inline.hpp" files into the appropriate files or by turning inline-functions declared in header files into ordinary functions in ".cpp" files.

Reviewed-by: coleenp, stefank, dholmes
2013-02-27 09:40:30 +01:00
Coleen Phillimore
b8b9434a9f 8000797: NPG: is_pseudo_string_at() doesn't work
Zero Symbol* for constant pool strings to indicate pseudo_strings (objects that aren't strings).  Clean up JVM_CONSTANT_Object and unused flags.

Reviewed-by: sspitsyn, jrose
2013-02-22 08:36:42 -05: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
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
Serguei Spitsyn
6ff685b4c8 Merge 2013-02-08 09:14:06 -08:00
Vladimir Danushevsky
ac1a75df8c Merge 2013-02-07 20:40:14 -05:00
Bill Pittore
9cad40fca6 Merge 2013-02-07 16:05:48 -05:00
Vladimir Ivanov
268a4d605c Merge 2013-02-07 12:23:51 -08: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
Igor Ignatyev
014d9489bb 8006613: adding reason to made_not_compilable
Reviewed-by: kvn, vlivanov
2013-02-05 08:25:51 -08:00
Coleen Phillimore
3b65d23bc8 Merge 2013-02-04 13:51:01 -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
Harold Seigel
1831def9cc 8000968: NPG: UseCompressedKlassPointers asserts with ObjectAlignmentInBytes for > 32G CompressedOops
Pick a base that works for both CompressedOpps alignment and CompressedKlassPtrs alignment.

Reviewed-by: kvn, roland
2013-02-04 08:26:02 -05:00
Jiangli Zhou
7eb8af5534 Merge 2013-02-01 19:36:55 -08:00
Jiangli Zhou
7cadb57785 Merge 2013-02-01 15:25:37 -05:00
Serguei Spitsyn
da8ccb9375 8006546: JSR 292: typos in the ConstantPool::copy_cp_impl()
Simple typos that need to be fixed

Reviewed-by: coleenp, twisti
2013-01-31 20:09:16 -08:00
Karen Kinnear
b28f16c910 Merge 2013-01-28 10:34:07 -05:00
Dean Long
0a2347e0ba Merge 2013-01-27 01:07:09 -08:00
Igor Ignatyev
a25db953cc 8006410: allocating without ResourceMark when CompileCommand was specified
Reviewed-by: kvn, vlivanov
2013-02-01 02:50:23 -08:00
Ioi Lam
93b845e21b 6479360: PrintClassHistogram improvements
Jcmd <pid> GC.class_stats (UnlockDiagnosticVMOptions)

Reviewed-by: coleenp, hseigel, sla, acorn
2013-01-25 15:06:18 -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
Ioi Lam
27c881b2fb 8006280: Need to reorder metadata structures to reduce size (64-bit)
Reordered Klass, InstanceKlass and Method to save 8 bytes each

Reviewed-by: coleenp, jiangli
2013-01-24 10:57:38 -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
833b7fcfff 8006548: version wrong in new constantPool code
Fix increment problem with saved_version

Reviewed-by: dholmes
2013-01-17 22:11:57 -05: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
Dean Long
6e8916cdbb Merge 2013-01-17 01:27:02 -05:00
Karen Kinnear
4ce43bafa5 Merge 2013-01-16 18:23:37 -05:00
Stefan Karlsson
67fc68ea7f 8005590: java_lang_Class injected field resolved_constructor appears unused
Reviewed-by: coleenp, dholmes
2013-01-15 13:32:13 +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
Jiangli Zhou
2cbabcea4a 8005895: Inefficient InstanceKlass field packing wasts memory
Pack _misc_has_default_methods into the _misc_flags, move _idnum_allocated_count.

Reviewed-by: coleenp, shade
2013-01-11 16:55:07 -05:00
Dean Long
f1bd82ba8f Merge 2013-01-09 21:18:52 -05:00
Zhengyu Gu
f4da82981d Merge 2013-01-08 15:47:23 -08:00
Zhengyu Gu
db4cfa5011 Merge 2013-01-08 11:39:53 -08:00
Zhengyu Gu
5c6318e816 8005048: NMT: #loaded classes needs to just show the # defined classes
Count number of instance classes so that it matches class metadata size

Reviewed-by: coleenp, acorn
2013-01-08 14:04:25 -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
Yumin Qi
ddb2b5d004 Merge 2012-12-19 16:10:19 -08:00
Coleen Phillimore
54bbf614e8 8004883: NPG: clean up anonymous class fix
Add klass_holder() to return either mirror or class_loader depending on if the class is anonymous or not.

Reviewed-by: stefank, jrose
2012-12-12 11:39:29 -05:00
Jiangli Zhou
511a9d8982 8004076: Move _max_locals and _size_of_parameters to ConstMethod for better sharing
Move _max_locals and _size_of_parameters to ConstMethod for better sharing.

Reviewed-by: coleenp, minqi, jrose
2012-12-11 12:41:31 -05:00
John Cuthbertson
6c0bf79f7a Merge 2012-11-30 12:01:34 -08:00
Chris Plummer
fdf8ceee2d Merge 2012-11-29 13:55:49 -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