82485 Commits

Author SHA1 Message Date
Joel Borggrén-Franck
34e1726860 8005712: Simplify support for repeating annotations in j.l.r.AnnotatedElement
8004919: AnnotationSupport uses possibly half-constructed AnnotationType instances

Implements the simplified semantics for repeating annotations and removes the incorrect obtaining of an AnnotationType

Reviewed-by: darcy, abuckley
2013-01-31 10:10:34 +01:00
David Katleman
9af4557880 Merge 2013-01-30 13:39:23 -08:00
David Katleman
5725cfdc73 Merge 2013-01-30 13:04:22 -08:00
Alejandro Murillo
294ab2b404 Merge 2013-01-30 10:18:33 -08:00
Jonathan Gibbons
c3cd43825b 8007034: debug printer for javac internals
Reviewed-by: mcimadamore
2013-01-30 09:47:12 -08:00
Jonathan Gibbons
ebc0ebf54d 8007096: DocLint parsing problems with some comments
Reviewed-by: mcimadamore
2013-01-30 09:40:54 -08:00
Athijegannathan Sundararajan
fcd28bdcc5 8007140: Java.extend crashes when attempting to extend java.lang.Object
Reviewed-by: lagergren, hannesw
2013-01-30 21:15:14 +05:30
Hannes Wallnöfer
411b70d54a 8007109: Regression: String(ConsString) does not flatten argument to String
Reviewed-by: sundar, lagergren
2013-01-30 14:57:19 +01:00
Athijegannathan Sundararajan
8cd63a75f2 8007132: Java objects returned from constructor functions are lost
Reviewed-by: hannesw, lagergren, attila
2013-01-30 17:52:54 +05:30
Marcus Lagergren
30b950d2d2 8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes
Lower suffered from being a "God class" trying to do everything at once.  As Nashorn code generation has grown, so has Lower. It does several post processing passes, tries to do several things at once even though all type information isn't in place, adjusting state afterwards and so on. It also performs control flow analysis, type attribution and constant folding, and  everything else code generation related before byte code emission. I have now separated the compilation process into Lower (create low level nodes from high level ones, copy code such as finally block inlining etc), Attr (assign types and symbols to all nodes - freeze slot and scope information) and FinalizeTypes (insert explicit casts, specialize invoke dynamic types for scope accesses). I've removed the kludgy AccessSpecializer, as this now integrates naturally with typing. Everything is now much easier to read and each module performs only one thing. I have added separate loggers for the separate tiers. In the process I have also fixed: (1) problems with type coercion (see test/script/basic/typecoercion.js, basically our coercion was too late and our symbol inference was erroneous. This only manifested itself in very rare occasions where toNumber coercion has side effects, such as for example when valueOf is overridden)  (2) copying literal nodes (literal copy did not use the superclass copy, which made all the Node specific fields not to be copied  (3) erroneous literal tokenization (literals shouldn't always just inherit token information from whatever node that creates them) (4) splitter weighnodes - unary nodes were considered weightless  (4) removed the hateful and kludgy "VarNode.shouldAppend", which really isn't needed when we have an attribution phase that determines self reference symbols (the only thing it was used for) (5) duplicate line number issues in the parser (6) convert bug in CodeGenerator for intermediate results of scope accesses (see test/script/basic/access-specializer.js) ... Several of these things just stopped being problems with the new architecture "can't happen anymore" and are not bug fixes per se. All tests run. No performance regressions exist that I've been able to measure. Some increases in performance were measured, but in the statistical margin of error (which is very wide as HotSpot currently has warmup issues with LambdaForms/invoke dynamic). Compile speed has not measurably increased.

Reviewed-by: jlaskey, attila
2013-01-30 12:26:45 +01:00
Lana Steuck
58717e9087 Merge 2013-01-29 20:19:48 -08:00
Lana Steuck
b034f7ca19 Merge 2013-01-29 20:16:12 -08:00
James Laskey
b342e3c536 8007094: Apply version to nashorn.jar manifest
Reviewed-by: sundar
2013-01-29 14:25:39 -04:00
Erik Joelsson
a1d7653c19 8006873: SWAT-b74 msvcr100.dll does not have the permission for all
Reviewed-by: alanb, tbell
2013-01-29 16:35:24 +01:00
Athijegannathan Sundararajan
ae80adfc10 8007091: Provide private API to pass application class loader for nashorn script engine
Reviewed-by: jlaskey, lagergren
2013-01-29 19:57:25 +05:30
Stefan Karlsson
e8860a177b 8004710: NPG: jmap could throw sun.jvm.hotspot.types.WrongTypeException after PermGen removal
When calculating live object regions, make sure that the alignment reserve, at the end of a TLAB, is excluded.

Reviewed-by: jmasa, brutisso
2013-01-29 10:51:33 +01:00
Joel Borggrén-Franck
b29b479461 8004698: Implement Core Reflection for Type Annotations
Reviewed-by: darcy
2013-01-29 10:32:49 +01:00
James Laskey
d56ceaa96b 8006676: Integrate Nashorn into new build system
Reviewed-by: jlaskey
2013-01-28 16:29:34 -04:00
James Laskey
813d9e8175 8006676: Integrate Nashorn into new build system
Reviewed-by: jlaskey
2013-01-28 16:29:10 -04:00
James Laskey
0b9014a9d6 8006676: Integrate Nashorn into new build system
Reviewed-by: jlaskey
2013-01-28 16:22:03 -04:00
Karen Kinnear
733d5fdd65 Merge 2013-01-28 09:33:55 -08:00
Athijegannathan Sundararajan
97a071dc3d 8007004: nashorn script engine should not use thread context class loader as script 'application loader'
Reviewed-by: attila, hannesw
2013-01-28 21:29:05 +05:30
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
Karen Kinnear
b28f16c910 Merge 2013-01-28 10:34:07 -05:00
Jesper Wilhelmsson
2447f369f6 6348447: Specifying -XX:OldSize crashes 64-bit VMs
Heap size will be set to allow for OldSize to fit. Also reviewed by vitalyd@gmail.com

Reviewed-by: ehelin, jmasa
2013-01-28 15:41:45 +01:00
Erik Joelsson
7d75509a22 Merge 2013-01-28 14:23:20 +01:00
Erik Joelsson
8be9f14166 Merge 2013-01-28 14:23:09 +01:00
Athijegannathan Sundararajan
daaeb20eff 8006983: Introduce a command line option to switch off syntactic extensions of nashorn
Reviewed-by: lagergren, attila
2013-01-28 18:10:16 +05:30
Edvard Wendelin
a320378fac 8006864: Update java.security-linux to include changes in java.security
Reviewed-by: mchung, mullan
2013-01-28 11:07:07 +01:00
Karen Kinnear
3f92d0764c Merge 2013-01-27 21:58:34 -05:00
Vicente Romero
b5148d30e2 8006944: javac, combo tests should print out the number of threads used
Reviewed-by: mcimadamore
2013-01-27 19:38:44 +00:00
Dean Long
0a2347e0ba Merge 2013-01-27 01:07:09 -08:00
Lana Steuck
f018e9352d Merge 2013-01-26 19:24:46 -08:00
Lana Steuck
f76350f541 Merge 2013-01-26 19:22:51 -08:00
Lana Steuck
d6e0250020 Merge 2013-01-26 18:25:33 -08:00
Lana Steuck
739b41a21e Merge 2013-01-26 18:24:49 -08:00
Eric Mccorkle
c2419823c8 8006503: JVM_PrintStackTrace is not used in JDK
Reviewed-by: alanb, darcy
2013-01-26 16:57:02 +00:00
Morris Meyer
7d8f623180 6518907: cleanup IA64 specific code in Hotspot
Removed unused IA64 specific code

Reviewed-by: twisti, kvn, dholmes
2013-01-25 16:50:33 -08:00
David Chase
89b8658977 8006500: compiler/8004741/Test8004741.java fails intermediately
Rewrote the test to be more reliable, add test for invalid size exception

Reviewed-by: kvn
2013-01-25 16:09:14 -08:00
Morris Meyer
6c80586b40 8005811: Turn off TierdCompilation in JDK8 trunk for all platforms
Disable tiered compilation in jdk8 because of CodeCache and performance anomalies

Reviewed-by: kvn, twisti
2013-01-25 16:31:47 -08:00
Igor Ignatyev
1a9e6be809 8005439: no message about inline method if it specifed by CompileCommand
Reviewed-by: kvn, vlivanov
2013-02-01 03:02:01 -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
Yumin Qi
fe8363948e Merge 2013-01-25 13:47:52 -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
Hannes Wallnöfer
327a6cf1b7 8006766: Array-like access to characters of a string is slow
Reviewed-by: lagergren, attila
2013-01-25 17:35:31 +01: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
Yumin Qi
f3c57efb11 Merge 2013-01-25 04:23:49 -08:00
Alejandro Murillo
0c7d523859 8006827: new hotspot build - hs25-b18
Reviewed-by: jcoomes
2013-01-25 03:03:23 -08:00
Alejandro Murillo
bf0716e7e4 Merge 2013-01-25 03:02:56 -08:00
Alejandro Murillo
6e9aeb3520 Added tag hs25-b17 for changeset f767fc368725 2013-01-25 02:36:28 -08:00