Karen Kinnear
8e1f6dce02
Merge
2013-03-27 16:31:00 -07:00
Karen Kinnear
b79e2c6803
8009731: Confusing error message for loader constraint violation
...
Fix text, overwritten type and holder for resolved method
Reviewed-by: coleenp, dcubed, minqi, dholmes
2013-03-27 14:10:59 -04:00
Coleen Phillimore
878c7e4cd0
8009531: Crash when redefining class with annotated method
...
Neglected to copy the annotations in clone_with_new_data when they were moved to ConstMethod.
Reviewed-by: acorn, sspitsyn, dcubed
2013-03-27 08:19:50 -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
Morris Meyer
e4b1cf5f02
Merge
2013-03-24 12:43:13 -07:00
Roland Westrelin
15178005e6
Merge
2013-03-21 22:00:14 -07:00
Morris Meyer
8d607b2446
Merge
2013-03-21 21:48:56 -07:00
Morris Meyer
6c55facb77
8009593: [parfait] Null pointer deference in hotspot/src/share/vm/oops/constantPool.cpp
...
Added guarantee() to print_entry_on()
Reviewed-by: kvn
2013-03-21 10:13:56 -07:00
Thomas Wuerthinger
06ef4cddf7
7153771: array bound check elimination for c1
...
When possible optimize out array bound checks, inserting predicates when needed.
Reviewed-by: never, kvn, twisti
2013-03-21 09:27:54 +01:00
Morris Meyer
c6d91fa2d9
8009022: [parfait] Null pointer deference in hotspot/src/share/vm/oops/generateOopMap.cpp
...
Add guarantee() checks to merge_state_into_bb()
Reviewed-by: kvn
2013-03-19 11:49:36 -07:00
Niclas Adlertz
e6e67652d9
8010121: Remove definition of ShouldNotReachHere2(msg)
...
Reviewed-by: kvn, stefank, rbackman, twisti
2013-03-19 10:31:16 +01:00
Ioi Lam
6f76ade8e1
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
...
Check for exception during SystemDictionary::resolve_instance_class_or_null() and clean up.
Reviewed-by: coleenp, acorn, hseigel, minqi
2013-03-15 17:24:40 -04: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
Coleen Phillimore
70b26044ba
8009836: nsk/regression/b4222717 fails with empty stack trace
...
Some zeroing was missed for bug 8003553, causing empty stack traces and Xcom crashes, add back zeroing to metablock
Reviewed-by: dholmes, rbackman
2013-03-13 09:10:35 -04:00
Daniel D. Daugherty
fc336457e7
Merge
2013-03-08 17:49:52 -08:00
Coleen Phillimore
addd95f165
8003553: NPG: metaspace objects should be zeroed in constructors
...
Zero metadata in constructors, not in allocation (and some in constructors)
Reviewed-by: jmasa, sspitsyn
2013-03-08 11:47:57 -05:00
Morris Meyer
6723fac299
Merge
2013-03-07 14:46:20 -08:00
Harold Seigel
455fd39d49
7158805: Better rewriting of nested subroutine calls
...
Reviewed-by: mschoene, coleenp
2013-03-07 11:49:38 -05:00
Morris Meyer
15108cd14e
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
...
Fix null pointer
Reviewed-by: kvn, coleenp
2013-03-05 18:03:36 -08:00
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