/hg/icedtea8-forest/nashorn: 86 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue May 17 02:04:18 UTC 2016
changeset b3b619e4a016 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=b3b619e4a016
author: andrew
date: Mon May 09 02:48:08 2016 +0100
Added tag icedtea-3.0-branchpoint for changeset 38236e7925eb
changeset c41243f4e15c in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=c41243f4e15c
author: asaha
date: Mon Oct 26 13:23:43 2015 -0700
Added tag jdk8u76-b00 for changeset 9ff5c2181333
changeset b7bbed8b05dd in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=b7bbed8b05dd
author: mhaupt
date: Mon Nov 23 10:08:15 2015 +0100
8143297: Nashorn compilation time reported in nanoseconds
Reviewed-by: hannesw, sundar
changeset 12b2f943fc6e in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=12b2f943fc6e
author: asaha
date: Mon Dec 21 15:23:00 2015 -0800
Added tag jdk8u76-b01 for changeset b7bbed8b05dd
changeset fa7dce1af94e in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=fa7dce1af94e
author: sundar
date: Thu Dec 17 20:04:46 2015 +0530
8145550: Megamorphic invoke should use CompiledFunction variants without any LinkLogic
Reviewed-by: jlaskey, hannesw, attila
changeset ab5cb7c26321 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=ab5cb7c26321
author: sundar
date: Thu Dec 17 20:14:06 2015 +0530
8145669: apply2call optimized callsite fails after becoming megamorphic
Reviewed-by: jlaskey, hannesw
changeset 4c1aa7b8c43c in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=4c1aa7b8c43c
author: robm
date: Wed Dec 23 00:51:07 2015 +0000
Merge
changeset 3f80f041ae70 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=3f80f041ae70
author: asaha
date: Mon Jan 04 12:09:09 2016 -0800
Added tag jdk8u76-b02 for changeset 4c1aa7b8c43c
changeset 86ed55da74ab in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=86ed55da74ab
author: sundar
date: Thu Dec 24 16:52:06 2015 +0530
8146147: Java linker indexed property getter does not work for computed nashorn string
Reviewed-by: jlaskey
changeset 3c65556df04e in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=3c65556df04e
author: robm
date: Mon Jan 04 17:30:46 2016 +0000
Merge
changeset a6dceee02cbc in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=a6dceee02cbc
author: robm
date: Mon Jan 04 21:58:31 2016 +0000
Merge
changeset b6d93f16a3bc in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=b6d93f16a3bc
author: asaha
date: Wed Dec 16 15:49:04 2015 -0800
Merge
changeset b53f0fb97671 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=b53f0fb97671
author: asaha
date: Tue Jan 05 08:33:06 2016 -0800
Merge
changeset 773d7b00d00d in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=773d7b00d00d
author: asaha
date: Tue Jan 05 08:54:00 2016 -0800
Merge
changeset 07db58f99673 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=07db58f99673
author: asaha
date: Fri Jan 15 16:24:44 2016 -0800
Merge
changeset 20c9a3e8bbc0 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=20c9a3e8bbc0
author: asaha
date: Tue Jan 19 13:08:05 2016 -0800
Added tag jdk8u76-b03 for changeset 07db58f99673
changeset 40c87509c0d6 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=40c87509c0d6
author: hannesw
date: Tue Jan 19 17:20:14 2016 +0100
8144131: ArrayData.getInt implementations do not convert to int32
Reviewed-by: attila, sundar, lagergren
changeset 95b8a01d3b52 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=95b8a01d3b52
author: hannesw
date: Tue Jan 19 18:56:23 2016 +0100
8147630: Wrong test result pushed to 8u-dev
Reviewed-by: attila
changeset c09b105e7be5 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=c09b105e7be5
author: hannesw
date: Fri Jan 22 16:18:19 2016 +0100
8144020: Remove long as an internal numeric type
Reviewed-by: attila, mhaupt
changeset bfc671539e50 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=bfc671539e50
author: hannesw
date: Fri Jan 22 16:32:41 2016 +0100
8143896: java.lang.Long is implicitly converted to double
Reviewed-by: lagergren, sundar
changeset 835b5b933b0a in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=835b5b933b0a
author: hannesw
date: Thu Jan 21 16:31:27 2016 +0100
8147845: Varargs Array functions still leaking longs
Reviewed-by: mhaupt, sundar
changeset 068c58427863 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=068c58427863
author: robm
date: Mon Jan 25 08:48:27 2016 +0000
Merge
changeset 120c1b8b4581 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=120c1b8b4581
author: asaha
date: Mon Jan 25 13:24:03 2016 -0800
Added tag jdk8u76-b04 for changeset 068c58427863
changeset c56acf06be0f in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=c56acf06be0f
author: asaha
date: Sun Mar 20 20:37:05 2016 -0700
Added tag jdk8u77-b03 for changeset b6ee21a35619
changeset d3dcf04b6b5c in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=d3dcf04b6b5c
author: asaha
date: Fri Oct 16 12:05:25 2015 -0700
Added tag jdk8u75-b00 for changeset c7eddafb2ee2
changeset ee2c313d02a3 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=ee2c313d02a3
author: asaha
date: Fri Oct 16 12:19:59 2015 -0700
Merge
changeset bf97e9141fe5 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=bf97e9141fe5
author: asaha
date: Thu Oct 29 17:22:12 2015 -0700
Merge
changeset 3629a9cd6627 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=3629a9cd6627
author: asaha
date: Wed Oct 28 22:05:37 2015 -0700
Added tag jdk8u66-b32 for changeset 52d1be12498e
changeset 822042f1e4e8 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=822042f1e4e8
author: asaha
date: Thu Oct 29 17:37:29 2015 -0700
Merge
changeset 95050a90c845 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=95050a90c845
author: asaha
date: Tue Nov 03 07:19:18 2015 -0800
Added tag jdk8u66-b33 for changeset 3629a9cd6627
changeset 5bbb4858350b in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=5bbb4858350b
author: asaha
date: Wed Nov 11 20:47:37 2015 -0800
Added tag jdk8u51-b34 for changeset bd915e4b7a4a
changeset a33c509181ce in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=a33c509181ce
author: asaha
date: Fri Nov 13 15:38:44 2015 -0800
Merge
changeset dbdadc4378e8 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=dbdadc4378e8
author: asaha
date: Tue Dec 01 22:55:46 2015 -0800
Added tag jdk8u66-b34 for changeset a33c509181ce
changeset 33ee43fc8148 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=33ee43fc8148
author: asaha
date: Wed Dec 02 23:08:29 2015 -0800
Merge
changeset 74ab3a7f55dd in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=74ab3a7f55dd
author: asaha
date: Wed Dec 02 23:22:21 2015 -0800
Merge
changeset 4f4e3fac4989 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=4f4e3fac4989
author: asaha
date: Thu Dec 03 10:34:35 2015 -0800
Added tag jdk8u66-b35 for changeset dbdadc4378e8
changeset 540d87751301 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=540d87751301
author: asaha
date: Thu Dec 03 13:34:56 2015 -0800
Merge
changeset dbedb3a0ea7a in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=dbedb3a0ea7a
author: asaha
date: Thu Dec 03 13:41:24 2015 -0800
Merge
changeset 517413d93e70 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=517413d93e70
author: asaha
date: Mon Dec 07 22:54:52 2015 -0800
Merge
changeset 7411850047ec in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=7411850047ec
author: asaha
date: Mon Dec 07 23:05:52 2015 -0800
Merge
changeset 8c3d1c48163a in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=8c3d1c48163a
author: asaha
date: Tue Dec 15 10:41:18 2015 -0800
Merge
changeset ebfcce60a80d in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=ebfcce60a80d
author: asaha
date: Tue Dec 15 08:41:10 2015 -0800
Added tag jdk8u66-b36 for changeset 4f4e3fac4989
changeset cf84d1a3c7ed in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=cf84d1a3c7ed
author: asaha
date: Tue Dec 15 14:26:55 2015 -0800
Merge
changeset 1767f4797d68 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=1767f4797d68
author: asaha
date: Tue Dec 15 14:41:59 2015 -0800
Merge
changeset 1a8a0867354d in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=1a8a0867354d
author: asaha
date: Mon Dec 21 10:57:24 2015 -0800
Merge
changeset 69fa156c1ebe in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=69fa156c1ebe
author: asaha
date: Mon Dec 21 11:20:20 2015 -0800
Merge
changeset bcee558a8d4b in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=bcee558a8d4b
author: asaha
date: Mon Dec 21 13:45:45 2015 -0800
Added tag jdk8u75-b01 for changeset 69fa156c1ebe
changeset c90794ad4d12 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=c90794ad4d12
author: alitvinov
date: Wed Dec 30 14:15:50 2015 +0300
Merge
changeset d46b669a2d2e in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=d46b669a2d2e
author: asaha
date: Sun Jan 03 22:40:50 2016 -0800
Added tag jdk8u72-b31 for changeset c90794ad4d12
changeset 9cce1ba325c4 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=9cce1ba325c4
author: asaha
date: Mon Jan 04 08:46:40 2016 -0800
Merge
changeset 541de42b5709 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=541de42b5709
author: asaha
date: Mon Jan 04 11:10:18 2016 -0800
Added tag jdk8u75-b02 for changeset 9cce1ba325c4
changeset 16d657d6cb22 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=16d657d6cb22
author: asaha
date: Mon Jan 11 13:45:31 2016 -0800
Added tag jdk8u75-b03 for changeset 541de42b5709
changeset dfa12474455f in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=dfa12474455f
author: asaha
date: Mon Jan 18 10:51:06 2016 -0800
Added tag jdk8u75-b04 for changeset 16d657d6cb22
changeset 1170f7a6fb8e in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=1170f7a6fb8e
author: asaha
date: Mon Jan 25 12:35:30 2016 -0800
Added tag jdk8u75-b05 for changeset dfa12474455f
changeset b31ba749a22e in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=b31ba749a22e
author: asaha
date: Mon Jan 25 15:11:24 2016 -0800
Merge
changeset 1922c287fe65 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=1922c287fe65
author: asaha
date: Tue Jan 26 12:40:42 2016 -0800
Added tag jdk8u76-b05 for changeset b31ba749a22e
changeset 1f85973e9533 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=1f85973e9533
author: asaha
date: Mon Feb 01 10:17:13 2016 -0800
Merge
changeset 3587da3cf2f2 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=3587da3cf2f2
author: asaha
date: Mon Feb 01 11:52:19 2016 -0800
Added tag jdk8u75-b06 for changeset 1f85973e9533
changeset 0d5cfd0fc819 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=0d5cfd0fc819
author: asaha
date: Mon Feb 01 12:25:26 2016 -0800
Merge
changeset addbcca78049 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=addbcca78049
author: asaha
date: Mon Feb 01 12:32:13 2016 -0800
Added tag jdk8u76-b06 for changeset 0d5cfd0fc819
changeset b1ee37988256 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=b1ee37988256
author: asaha
date: Mon Feb 08 11:17:51 2016 -0800
Added tag jdk8u75-b07 for changeset 3587da3cf2f2
changeset 454441af0467 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=454441af0467
author: asaha
date: Mon Feb 08 11:58:30 2016 -0800
Merge
changeset fd0f9107fc55 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=fd0f9107fc55
author: asaha
date: Mon Feb 08 12:03:17 2016 -0800
Added tag jdk8u76-b07 for changeset 454441af0467
changeset fd2b29bd7cb6 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=fd2b29bd7cb6
author: asaha
date: Mon Feb 15 16:32:50 2016 -0800
Added tag jdk8u75-b08 for changeset b1ee37988256
changeset 018d3bf827fe in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=018d3bf827fe
author: asaha
date: Mon Feb 15 16:52:03 2016 -0800
Merge
changeset d59eb087012e in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=d59eb087012e
author: asaha
date: Mon Feb 15 17:10:13 2016 -0800
Added tag jdk8u76-b08 for changeset 018d3bf827fe
changeset bab68ab3df71 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=bab68ab3df71
author: asaha
date: Mon Feb 22 13:07:47 2016 -0800
Added tag jdk8u75-b09 for changeset fd2b29bd7cb6
changeset fe15575fd53e in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=fe15575fd53e
author: asaha
date: Mon Feb 22 13:20:58 2016 -0800
Merge
changeset 45bfeb35122d in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=45bfeb35122d
author: asaha
date: Mon Feb 22 13:26:31 2016 -0800
Added tag jdk8u76-b09 for changeset fe15575fd53e
changeset e35e96663a90 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=e35e96663a90
author: asaha
date: Mon Feb 29 10:33:44 2016 -0800
Added tag jdk8u75-b10 for changeset bab68ab3df71
changeset 2816d2045f01 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=2816d2045f01
author: asaha
date: Mon Feb 29 11:54:50 2016 -0800
Merge
changeset 0608b63feb60 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=0608b63feb60
author: asaha
date: Mon Feb 29 11:59:57 2016 -0800
Added tag jdk8u76-b10 for changeset 2816d2045f01
changeset 9017fb8d690a in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=9017fb8d690a
author: asaha
date: Mon Mar 07 10:53:05 2016 -0800
Added tag jdk8u76-b11 for changeset 0608b63feb60
changeset a2c005a7b33a in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=a2c005a7b33a
author: asaha
date: Tue Mar 15 13:34:02 2016 -0700
Added tag jdk8u75-b12 for changeset e35e96663a90
changeset da1aa86606ef in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=da1aa86606ef
author: asaha
date: Tue Mar 15 13:55:36 2016 -0700
Merge
changeset 256922f1e9e7 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=256922f1e9e7
author: asaha
date: Tue Mar 15 14:01:54 2016 -0700
Added tag jdk8u76-b12 for changeset da1aa86606ef
changeset 457737eb4b9f in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=457737eb4b9f
author: asaha
date: Thu Mar 17 08:19:17 2016 -0700
Added tag jdk8u92-b00 for changeset 256922f1e9e7
changeset 309a5e14e5e2 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=309a5e14e5e2
author: asaha
date: Thu Mar 17 08:10:13 2016 -0700
Added tag jdk8u91-b00 for changeset a2c005a7b33a
changeset 22925b345dff in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=22925b345dff
author: asaha
date: Mon Mar 21 23:03:24 2016 -0700
Merge
changeset 6296644a2c9c in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=6296644a2c9c
author: asaha
date: Tue Mar 22 10:30:12 2016 -0700
Added tag jdk8u91-b13 for changeset 22925b345dff
changeset e2294411edbd in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=e2294411edbd
author: asaha
date: Tue Mar 22 11:36:55 2016 -0700
Merge
changeset d0fba38a0705 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=d0fba38a0705
author: asaha
date: Tue Mar 22 21:31:52 2016 -0700
Added tag jdk8u92-b13 for changeset e2294411edbd
changeset 32b80df71ca2 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=32b80df71ca2
author: asaha
date: Thu Mar 31 10:01:04 2016 -0700
Added tag jdk8u91-b14 for changeset 6296644a2c9c
changeset d2af8d029722 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=d2af8d029722
author: asaha
date: Thu Mar 31 10:17:29 2016 -0700
Merge
changeset 8dbea1d5ea71 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=8dbea1d5ea71
author: andrew
date: Mon May 09 04:37:17 2016 +0100
Merge jdk8u92-b14
changeset a69ff719fccb in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=a69ff719fccb
author: andrew
date: Tue May 17 03:03:34 2016 +0100
Added tag icedtea-3.1.0pre01 for changeset 8dbea1d5ea71
diffstat:
.hgtags | 40 +
make/build.xml | 7 +
src/jdk/internal/dynalink/beans/AbstractJavaLinker.java | 2 +-
src/jdk/nashorn/internal/codegen/CodeGenerator.java | 102 +-
src/jdk/nashorn/internal/codegen/Compiler.java | 3 +-
src/jdk/nashorn/internal/codegen/FieldObjectCreator.java | 9 +-
src/jdk/nashorn/internal/codegen/FoldConstants.java | 14 +-
src/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java | 38 +-
src/jdk/nashorn/internal/codegen/MethodEmitter.java | 1 -
src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java | 20 +-
src/jdk/nashorn/internal/codegen/ObjectCreator.java | 11 +-
src/jdk/nashorn/internal/codegen/SpillObjectCreator.java | 8 +-
src/jdk/nashorn/internal/codegen/TypeEvaluator.java | 2 +-
src/jdk/nashorn/internal/codegen/types/IntType.java | 2 +-
src/jdk/nashorn/internal/codegen/types/LongType.java | 104 +--
src/jdk/nashorn/internal/codegen/types/Type.java | 2 +-
src/jdk/nashorn/internal/ir/BinaryNode.java | 17 +-
src/jdk/nashorn/internal/ir/LiteralNode.java | 9 +-
src/jdk/nashorn/internal/ir/Symbol.java | 19 +-
src/jdk/nashorn/internal/objects/Global.java | 13 -
src/jdk/nashorn/internal/objects/NativeArguments.java | 6 -
src/jdk/nashorn/internal/objects/NativeArray.java | 97 +-
src/jdk/nashorn/internal/objects/NativeDate.java | 5 +-
src/jdk/nashorn/internal/objects/NativeFloat32Array.java | 12 +-
src/jdk/nashorn/internal/objects/NativeFloat64Array.java | 12 +-
src/jdk/nashorn/internal/objects/NativeInt16Array.java | 15 -
src/jdk/nashorn/internal/objects/NativeInt32Array.java | 15 -
src/jdk/nashorn/internal/objects/NativeInt8Array.java | 15 -
src/jdk/nashorn/internal/objects/NativeJSAdapter.java | 120 --
src/jdk/nashorn/internal/objects/NativeNumber.java | 3 +-
src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java | 2 +-
src/jdk/nashorn/internal/objects/NativeString.java | 62 +-
src/jdk/nashorn/internal/objects/NativeUint16Array.java | 15 -
src/jdk/nashorn/internal/objects/NativeUint32Array.java | 44 +-
src/jdk/nashorn/internal/objects/NativeUint8Array.java | 15 -
src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java | 15 -
src/jdk/nashorn/internal/parser/JSONParser.java | 4 -
src/jdk/nashorn/internal/parser/Lexer.java | 8 +-
src/jdk/nashorn/internal/runtime/AccessorProperty.java | 35 +-
src/jdk/nashorn/internal/runtime/DebuggerSupport.java | 2 +-
src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java | 85 --
src/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java | 7 +-
src/jdk/nashorn/internal/runtime/FindProperty.java | 17 -
src/jdk/nashorn/internal/runtime/GlobalFunctions.java | 3 -
src/jdk/nashorn/internal/runtime/JSType.java | 412 +--------
src/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java | 84 +-
src/jdk/nashorn/internal/runtime/Property.java | 23 -
src/jdk/nashorn/internal/runtime/PropertyAccess.java | 133 ---
src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java | 2 +-
src/jdk/nashorn/internal/runtime/ScriptFunction.java | 7 +
src/jdk/nashorn/internal/runtime/ScriptFunctionData.java | 18 +-
src/jdk/nashorn/internal/runtime/ScriptObject.java | 326 +-------
src/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java | 25 +-
src/jdk/nashorn/internal/runtime/UserAccessorProperty.java | 36 -
src/jdk/nashorn/internal/runtime/arrays/ArrayData.java | 67 +-
src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java | 17 -
src/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java | 11 -
src/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java | 16 +-
src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java | 6 -
src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java | 18 -
src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java | 8 -
src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java | 46 +-
src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java | 2 +-
src/jdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java | 25 -
src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java | 406 ---------
src/jdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java | 8 -
src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java | 25 +-
src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java | 20 +-
src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java | 31 -
src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java | 25 -
src/jdk/nashorn/internal/runtime/linker/Bootstrap.java | 20 +-
src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java | 5 +-
src/jdk/nashorn/internal/runtime/linker/NashornGuards.java | 26 +-
src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java | 5 +-
test/script/basic/JDK-8030200.js | 2 +-
test/script/basic/JDK-8062799.js | 21 -
test/script/basic/JDK-8062799.js.EXPECTED | 18 -
test/script/basic/JDK-8079145.js.EXPECTED | 16 +-
test/script/basic/JDK-8143896.js | 107 ++
test/script/basic/JDK-8144020.js | 126 +++
test/script/basic/JDK-8144131.js | 44 +
test/script/basic/JDK-8145550.js | 33 +
test/script/basic/JDK-8146147.js | 49 +
test/script/basic/JDK-8147845.js | 44 +
test/script/basic/apply_to_call/JDK-8145669.js | 33 +
test/script/basic/apply_to_call/JDK-8145669.js.EXPECTED | 8 +
test/script/basic/apply_to_call/JDK-8145669_2.js | 33 +
test/script/basic/apply_to_call/JDK-8145669_2.js.EXPECTED | 66 +
test/script/basic/minuszero.js | 4 +
test/script/basic/minuszero.js.EXPECTED | 3 +
test/script/nosecurity/JDK-8067215.js | 12 +-
test/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java | 2 +-
test/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java | 8 +-
test/src/jdk/nashorn/test/models/LongProvider.java | 63 +
94 files changed, 1076 insertions(+), 2506 deletions(-)
diffs (truncated from 6346 to 500 lines):
diff -r 38236e7925eb -r a69ff719fccb .hgtags
--- a/.hgtags Sun Apr 10 01:08:23 2016 +0100
+++ b/.hgtags Tue May 17 03:03:34 2016 +0100
@@ -420,6 +420,7 @@
4e5f9de7a3dfd0c4e15714863007ac591e9dffea jdk8u51-b31
009644f58d73263eec2582a84a1e9b63975c5387 jdk8u51-b32
eac4b87f86dde817023a07dcb701dc5d986b705f jdk8u51-b33
+bd915e4b7a4a8ddffec5c54829bde3cf9579f9d0 jdk8u51-b34
6ec61d2494283fbaca6df227f1a5b45487dc1ca7 jdk8u60-b00
af290f203369ecf8e67b89c4a3a8df0bf535230e jdk8u60-b01
39e0c14d45c3fee93a29993f1415b3393d03483f jdk8u60-b02
@@ -489,6 +490,11 @@
3cc16ff2735c6818b68fdf161ddbcc89a5b4db1a jdk8u66-b17
39bfb9eb75dcb2176a87ac3b025a665c41244e54 jdk8u66-b18
3e08bc604b2166b251833e522892ffcfd22b4b88 jdk8u66-b31
+52d1be12498e2390cf0581040ce6f4ab7258b498 jdk8u66-b32
+3629a9cd6627e0b9e1a0735be214b20fd2f9a743 jdk8u66-b33
+a33c509181cef86d6799d1e6ec389de2990bc16c jdk8u66-b34
+dbdadc4378e843b908e4dcf7c2348ba845672ed4 jdk8u66-b35
+4f4e3fac49899923f8cf871fba5572b28db60212 jdk8u66-b36
a7ac4116ee88aa86fec5ac66901302e11f578172 jdk8u71-b00
b8987f466586180cb4dc387f5fa290bb4cf34983 jdk8u71-b01
a8fd49cb76fafc704b746a98bd18647802674d2d jdk8u71-b02
@@ -528,8 +534,42 @@
2a36c3c61f905c5b389ae1d62f446e57f96be3a2 jdk8u74-b00
ae6c74c1197afcbd83d393aa6f96221d759022a2 jdk8u74-b01
3107cf87696f0516d6f5fa7cdc416069e2800d02 jdk8u74-b02
+c90794ad4d12eeeae5d9bbfce65fa0043a313548 jdk8u72-b31
+c7eddafb2ee2cc9d62f20c4d821ccac03bd4617d jdk8u75-b00
+69fa156c1ebe6a8d6587147967e8e27f6de37d99 jdk8u75-b01
+9cce1ba325c4bd8e922380c911d1a9ace79d6717 jdk8u75-b02
+541de42b57098a5009055cc92f1139473e32f19d jdk8u75-b03
+16d657d6cb22e832139a1cbc2ec23a5cf9db8985 jdk8u75-b04
+dfa12474455fa6f4c48a6dee986c24db257161ad jdk8u75-b05
+1f85973e9533f7c9b1bae1e00b76a2184c5eed4c jdk8u75-b06
+3587da3cf2f204791a68138a110eda9b8874523d jdk8u75-b07
+b1ee37988256c198cb009b36b9b0d9d6d4b2685c jdk8u75-b08
+fd2b29bd7cb64a9a04d75a659bc683751b3a4f35 jdk8u75-b09
+bab68ab3df71269887bb3572291a19f7856e49dc jdk8u75-b10
+e35e96663a905f0258f6572ab6a07fbea71b9d45 jdk8u75-b12
7bce03d47545e6a5341a2722168cd6bf697c4132 jdk8u77-b00
678b645aa10aaf27895c87872c399c15daa026a1 jdk8u77-b01
09abd795d1d143933224bcb3f12f5d4686b65373 jdk8u77-b02
82dc1533255a553c3269f6a2ec8242e3a1638d67 icedtea-3.0.0pre10
697c5f792becf185ec29d7f60c3491f08800a109 icedtea-3.0.0
+38236e7925eb3b7929ae89e54ff96cb854d01fbb icedtea-3.0-branchpoint
+b6ee21a35619ce4d3b46a9b825438a3bc9bb63cd jdk8u77-b03
+a2c005a7b33abed886cfb4309a846dd80c87bd4e jdk8u91-b00
+22925b345dffe4ba96fe2f429c4185cda1b30239 jdk8u91-b13
+6296644a2c9c30db0062117fc776341e937ca1f9 jdk8u91-b14
+9ff5c21813330147bf08389b3992534780c93247 jdk8u76-b00
+b7bbed8b05dd50c27050c7e10e20d25329dcd32b jdk8u76-b01
+4c1aa7b8c43c6fd38f9c13a6df2264378dd6a873 jdk8u76-b02
+07db58f99673790d5139e8497552ac331e0824f5 jdk8u76-b03
+068c584278637dae589e7d648c265149e80c8a24 jdk8u76-b04
+b31ba749a22e9dce7637e709122e1138b01e8b66 jdk8u76-b05
+0d5cfd0fc8192fd4569300135f81f5f2b7a7bd90 jdk8u76-b06
+454441af046768d86420749d6b7959dfdb1004bb jdk8u76-b07
+018d3bf827feeaeed0f3b61948b44f64c73efd12 jdk8u76-b08
+fe15575fd53e7ee8e8bf44728bab9cc0a9e6b107 jdk8u76-b09
+2816d2045f017d1b0dfd20319bbb59004d698396 jdk8u76-b10
+0608b63feb608f36bde691498d2ad22c7c24ad0f jdk8u76-b11
+da1aa86606ef1b46655ae28d34e0d02604fb4cde jdk8u76-b12
+256922f1e9e7648eb5af5a9da82ff8032b3855bc jdk8u92-b00
+e2294411edbda51165bc1a10261c246cb4d3c5c5 jdk8u92-b13
+8dbea1d5ea71738dbdd28cd0537b2624ad389f56 icedtea-3.1.0pre01
diff -r 38236e7925eb -r a69ff719fccb make/build.xml
--- a/make/build.xml Sun Apr 10 01:08:23 2016 +0100
+++ b/make/build.xml Tue May 17 03:03:34 2016 +0100
@@ -356,6 +356,13 @@
permission java.util.PropertyPermission "nashorn.test.*", "read";
};
+grant codeBase "file:/${basedir}/test/script/basic/apply_to_call/*" {
+ permission java.io.FilePermission "${basedir}/test/script/-", "read";
+ permission java.io.FilePermission "$${user.dir}", "read";
+ permission java.util.PropertyPermission "user.dir", "read";
+ permission java.util.PropertyPermission "nashorn.test.*", "read";
+};
+
grant codeBase "file:/${basedir}/test/script/basic/parser/*" {
permission java.io.FilePermission "${basedir}/test/script/-", "read";
permission java.io.FilePermission "$${user.dir}", "read";
diff -r 38236e7925eb -r a69ff719fccb src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
--- a/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Sun Apr 10 01:08:23 2016 +0100
+++ b/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Tue May 17 03:03:34 2016 +0100
@@ -782,7 +782,7 @@
*/
@SuppressWarnings("unused")
private Object getPropertyGetterHandle(final Object id) {
- return propertyGetters.get(id);
+ return propertyGetters.get(String.valueOf(id));
}
// Type is MethodHandle(BeanLinker, MethodType, LinkerServices, Object, String, Object), of which the two "Object"
diff -r 38236e7925eb -r a69ff719fccb src/jdk/nashorn/internal/codegen/CodeGenerator.java
--- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java Sun Apr 10 01:08:23 2016 +0100
+++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java Tue May 17 03:03:34 2016 +0100
@@ -188,8 +188,6 @@
private static final Call ENSURE_INT = CompilerConstants.staticCallNoLookup(OptimisticReturnFilters.class,
"ensureInt", int.class, Object.class, int.class);
- private static final Call ENSURE_LONG = CompilerConstants.staticCallNoLookup(OptimisticReturnFilters.class,
- "ensureLong", long.class, Object.class, int.class);
private static final Call ENSURE_NUMBER = CompilerConstants.staticCallNoLookup(OptimisticReturnFilters.class,
"ensureNumber", double.class, Object.class, int.class);
@@ -1720,7 +1718,7 @@
enterStatement(expressionStatement);
loadAndDiscard(expressionStatement.getExpression());
- assert method.getStackSize() == 0;
+ assert method.getStackSize() == 0 : "stack not empty in " + expressionStatement;
return false;
}
@@ -2235,7 +2233,7 @@
* @param arrayType the type of the array, e.g. ARRAY_NUMBER or ARRAY_OBJECT
*/
private void loadArray(final ArrayLiteralNode arrayLiteralNode, final ArrayType arrayType) {
- assert arrayType == Type.INT_ARRAY || arrayType == Type.LONG_ARRAY || arrayType == Type.NUMBER_ARRAY || arrayType == Type.OBJECT_ARRAY;
+ assert arrayType == Type.INT_ARRAY || arrayType == Type.NUMBER_ARRAY || arrayType == Type.OBJECT_ARRAY;
final Expression[] nodes = arrayLiteralNode.getValue();
final Object presets = arrayLiteralNode.getPresets();
@@ -2383,20 +2381,9 @@
method.convert(Type.OBJECT);
} else if(!resultBounds.canBeNarrowerThan(Type.NUMBER)) {
method.load(((Integer)value).doubleValue());
- } else if(!resultBounds.canBeNarrowerThan(Type.LONG)) {
- method.load(((Integer)value).longValue());
} else {
method.load((Integer)value);
}
- } else if (value instanceof Long) {
- if(!resultBounds.canBeNarrowerThan(Type.OBJECT)) {
- method.load((Long)value);
- method.convert(Type.OBJECT);
- } else if(!resultBounds.canBeNarrowerThan(Type.NUMBER)) {
- method.load(((Long)value).doubleValue());
- } else {
- method.load((Long)value);
- }
} else if (value instanceof Double) {
if(!resultBounds.canBeNarrowerThan(Type.OBJECT)) {
method.load((Double)value);
@@ -3647,8 +3634,6 @@
private void loadMinusOne() {
if (type.isInteger()) {
method.load(isIncrement ? 1 : -1);
- } else if (type.isLong()) {
- method.load(isIncrement ? 1L : -1L);
} else {
method.load(isIncrement ? 1.0 : -1.0);
}
@@ -4030,23 +4015,66 @@
}
private void loadASSIGN_SHR(final BinaryNode binaryNode) {
- new BinarySelfAssignment(binaryNode) {
+ new SelfModifyingStore<BinaryNode>(binaryNode, binaryNode.lhs()) {
@Override
- protected void op() {
- doSHR();
- }
-
+ protected void evaluate() {
+ new OptimisticOperation(assignNode, new TypeBounds(Type.INT, Type.NUMBER)) {
+ @Override
+ void loadStack() {
+ assert assignNode.getWidestOperandType() == Type.INT;
+ if (isRhsZero(binaryNode)) {
+ loadExpressionAsType(binaryNode.lhs(), Type.INT);
+ } else {
+ loadBinaryOperands(binaryNode.lhs(), binaryNode.rhs(), TypeBounds.INT, true, false);
+ method.shr();
+ }
+ }
+
+ @Override
+ void consumeStack() {
+ if (isOptimistic(binaryNode)) {
+ toUint32Optimistic(binaryNode.getProgramPoint());
+ } else {
+ toUint32Double();
+ }
+ }
+ }.emit(getOptimisticIgnoreCountForSelfModifyingExpression(binaryNode.lhs()));
+ method.convert(assignNode.getType());
+ }
}.store();
}
- private void doSHR() {
- // TODO: make SHR optimistic
- method.shr();
- toUint();
- }
-
- private void toUint() {
- JSType.TO_UINT32_I.invoke(method);
+ private void doSHR(final BinaryNode binaryNode) {
+ new OptimisticOperation(binaryNode, new TypeBounds(Type.INT, Type.NUMBER)) {
+ @Override
+ void loadStack() {
+ if (isRhsZero(binaryNode)) {
+ loadExpressionAsType(binaryNode.lhs(), Type.INT);
+ } else {
+ loadBinaryOperands(binaryNode);
+ method.shr();
+ }
+ }
+
+ @Override
+ void consumeStack() {
+ if (isOptimistic(binaryNode)) {
+ toUint32Optimistic(binaryNode.getProgramPoint());
+ } else {
+ toUint32Double();
+ }
+ }
+ }.emit();
+
+ }
+
+ private void toUint32Optimistic(final int programPoint) {
+ method.load(programPoint);
+ JSType.TO_UINT32_OPTIMISTIC.invoke(method);
+ }
+
+ private void toUint32Double() {
+ JSType.TO_UINT32_DOUBLE.invoke(method);
}
private void loadASSIGN_SUB(final BinaryNode binaryNode) {
@@ -4084,7 +4112,7 @@
// Non-optimistic, non-FP subtraction or multiplication. Allow them to overflow.
operandBounds = new TypeBounds(Type.narrowest(node.getWidestOperandType(),
numericBounds.widest), Type.NUMBER);
- forceConversionSeparation = node.getWidestOperationType().narrowerThan(numericBounds.widest);
+ forceConversionSeparation = true;
}
}
loadBinaryOperands(node.lhs(), node.rhs(), operandBounds, false, forceConversionSeparation);
@@ -4186,14 +4214,7 @@
}
private void loadSHR(final BinaryNode binaryNode) {
- // Optimize x >>> 0 to (uint)x
- if (isRhsZero(binaryNode)) {
- loadExpressionAsType(binaryNode.lhs(), Type.INT);
- toUint();
- } else {
- loadBinaryOperands(binaryNode);
- doSHR();
- }
+ doSHR(binaryNode);
}
private void loadSUB(final BinaryNode binaryNode, final TypeBounds resultBounds) {
@@ -4464,6 +4485,7 @@
}
} else {
final Type storeType = assignNode.getType();
+ assert storeType != Type.LONG;
if (symbol.hasSlotFor(storeType)) {
// Only emit a convert for a store known to be live; converts for dead stores can
// give us an unnecessary ClassCastException.
@@ -4848,8 +4870,6 @@
method.load(optimistic.getProgramPoint());
if(optimisticType.isInteger()) {
method.invoke(ENSURE_INT);
- } else if(optimisticType.isLong()) {
- method.invoke(ENSURE_LONG);
} else if(optimisticType.isNumber()) {
method.invoke(ENSURE_NUMBER);
} else {
diff -r 38236e7925eb -r a69ff719fccb src/jdk/nashorn/internal/codegen/Compiler.java
--- a/src/jdk/nashorn/internal/codegen/Compiler.java Sun Apr 10 01:08:23 2016 +0100
+++ b/src/jdk/nashorn/internal/codegen/Compiler.java Tue May 17 03:03:34 2016 +0100
@@ -46,6 +46,7 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.logging.Level;
@@ -683,7 +684,7 @@
if (time > 0L && timeLogger != null) {
assert env.isTimingEnabled();
- sb.append(" in ").append(time).append(" ms");
+ sb.append(" in ").append(TimeUnit.NANOSECONDS.toMillis(time)).append(" ms");
}
log.info(sb);
}
diff -r 38236e7925eb -r a69ff719fccb src/jdk/nashorn/internal/codegen/FieldObjectCreator.java
--- a/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java Sun Apr 10 01:08:23 2016 +0100
+++ b/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java Tue May 17 03:03:34 2016 +0100
@@ -167,8 +167,7 @@
assert fieldName.equals(getFieldName(fieldIndex, PRIMITIVE_FIELD_TYPE)) || fieldType.isObject() : key + " object keys must store to L*-fields";
assert fieldName.equals(getFieldName(fieldIndex, Type.OBJECT)) || fieldType.isPrimitive() : key + " primitive keys must store to J*-fields";
- loadTuple(method, tuple);
-
+ loadTuple(method, tuple, true);
method.putField(fieldClass, fieldName, fieldDesc);
}
@@ -180,11 +179,7 @@
* @param tuple Tuple to store.
*/
private void putSlot(final MethodEmitter method, final long index, final MapTuple<T> tuple) {
- if (JSType.isRepresentableAsInt(index)) {
- method.load((int)index);
- } else {
- method.load(index);
- }
+ loadIndex(method, index);
loadTuple(method, tuple, false); //we don't pack array like objects
method.dynamicSetIndex(callSiteFlags);
}
diff -r 38236e7925eb -r a69ff719fccb src/jdk/nashorn/internal/codegen/FoldConstants.java
--- a/src/jdk/nashorn/internal/codegen/FoldConstants.java Sun Apr 10 01:08:23 2016 +0100
+++ b/src/jdk/nashorn/internal/codegen/FoldConstants.java Tue May 17 03:03:34 2016 +0100
@@ -234,6 +234,8 @@
case ADD:
if (rhsInteger) {
literalNode = LiteralNode.newInstance(token, finish, rhs.getInt32());
+ } else if (rhsType.isLong()) {
+ literalNode = LiteralNode.newInstance(token, finish, rhs.getLong());
} else {
literalNode = LiteralNode.newInstance(token, finish, rhs.getNumber());
}
@@ -241,6 +243,8 @@
case SUB:
if (rhsInteger && rhs.getInt32() != 0) { // @see test/script/basic/minuszero.js
literalNode = LiteralNode.newInstance(token, finish, -rhs.getInt32());
+ } else if (rhsType.isLong() && rhs.getLong() != 0L) {
+ literalNode = LiteralNode.newInstance(token, finish, -rhs.getLong());
} else {
literalNode = LiteralNode.newInstance(token, finish, -rhs.getNumber());
}
@@ -303,9 +307,7 @@
final Type widest = Type.widest(lhs.getType(), rhs.getType());
boolean isInteger = widest.isInteger();
- boolean isLong = widest.isLong();
-
- double value;
+ final double value;
switch (parent.tokenType()) {
case DIV:
@@ -332,7 +334,8 @@
value = lhs.getNumber() - rhs.getNumber();
break;
case SHR:
- return LiteralNode.newInstance(token, finish, JSType.toUint32(lhs.getInt32() >>> rhs.getInt32()));
+ final long result = JSType.toUint32(lhs.getInt32() >>> rhs.getInt32());
+ return LiteralNode.newInstance(token, finish, JSType.toNarrowestNumber(result));
case SAR:
return LiteralNode.newInstance(token, finish, lhs.getInt32() >> rhs.getInt32());
case SHL:
@@ -364,12 +367,9 @@
}
isInteger &= JSType.isStrictlyRepresentableAsInt(value);
- isLong &= JSType.isStrictlyRepresentableAsLong(value);
if (isInteger) {
return LiteralNode.newInstance(token, finish, (int)value);
- } else if (isLong) {
- return LiteralNode.newInstance(token, finish, (long)value);
}
return LiteralNode.newInstance(token, finish, value);
diff -r 38236e7925eb -r a69ff719fccb src/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
--- a/src/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java Sun Apr 10 01:08:23 2016 +0100
+++ b/src/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java Tue May 17 03:03:34 2016 +0100
@@ -131,7 +131,6 @@
UNDEFINED(Type.UNDEFINED),
BOOLEAN(Type.BOOLEAN),
INT(Type.INT),
- LONG(Type.LONG),
DOUBLE(Type.NUMBER),
OBJECT(Type.OBJECT);
@@ -272,12 +271,9 @@
}
private static class SymbolConversions {
- private static byte I2L = 1 << 0;
- private static byte I2D = 1 << 1;
- private static byte I2O = 1 << 2;
- private static byte L2D = 1 << 3;
- private static byte L2O = 1 << 4;
- private static byte D2O = 1 << 5;
+ private static final byte I2D = 1 << 0;
+ private static final byte I2O = 1 << 1;
+ private static final byte D2O = 1 << 2;
private byte conversions;
@@ -288,9 +284,6 @@
case INT:
case BOOLEAN:
switch (to) {
- case LONG:
- recordConversion(I2L);
- return;
case DOUBLE:
recordConversion(I2D);
return;
@@ -301,18 +294,6 @@
illegalConversion(from, to);
return;
}
- case LONG:
- switch (to) {
- case DOUBLE:
- recordConversion(L2D);
- return;
- case OBJECT:
- recordConversion(L2O);
- return;
- default:
- illegalConversion(from, to);
- return;
- }
case DOUBLE:
if(to == LvarType.OBJECT) {
recordConversion(D2O);
@@ -340,26 +321,15 @@
if(hasConversion(D2O)) {
symbol.setHasSlotFor(Type.NUMBER);
}
- if(hasConversion(L2O)) {
- symbol.setHasSlotFor(Type.LONG);
- }
if(hasConversion(I2O)) {
symbol.setHasSlotFor(Type.INT);
}
}
if(symbol.hasSlotFor(Type.NUMBER)) {
- if(hasConversion(L2D)) {
- symbol.setHasSlotFor(Type.LONG);
- }
if(hasConversion(I2D)) {
symbol.setHasSlotFor(Type.INT);
}
}
- if(symbol.hasSlotFor(Type.LONG)) {
- if(hasConversion(I2L)) {
- symbol.setHasSlotFor(Type.INT);
- }
- }
}
}
@@ -378,7 +348,7 @@
if(lvarType != null) {
return lvarType;
}
- assert type.isObject();
+ assert type.isObject() : "Unsupported primitive type: " + type;
return LvarType.OBJECT;
}
private static LvarType widestLvarType(final LvarType t1, final LvarType t2) {
diff -r 38236e7925eb -r a69ff719fccb src/jdk/nashorn/internal/codegen/MethodEmitter.java
--- a/src/jdk/nashorn/internal/codegen/MethodEmitter.java Sun Apr 10 01:08:23 2016 +0100
+++ b/src/jdk/nashorn/internal/codegen/MethodEmitter.java Tue May 17 03:03:34 2016 +0100
@@ -543,7 +543,6 @@
} else {
assert false : type + " cannot be packed!";
}
- //all others are nops, objects aren't packed
}
/**
diff -r 38236e7925eb -r a69ff719fccb src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
--- a/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Sun Apr 10 01:08:23 2016 +0100
+++ b/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Tue May 17 03:03:34 2016 +0100
@@ -41,7 +41,6 @@
import static jdk.nashorn.internal.runtime.JSType.GET_UNDEFINED;
import static jdk.nashorn.internal.runtime.JSType.TYPE_DOUBLE_INDEX;
import static jdk.nashorn.internal.runtime.JSType.TYPE_INT_INDEX;
-import static jdk.nashorn.internal.runtime.JSType.TYPE_LONG_INDEX;
import static jdk.nashorn.internal.runtime.JSType.TYPE_OBJECT_INDEX;
import static jdk.nashorn.internal.runtime.JSType.TYPE_UNDEFINED_INDEX;
import static jdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
@@ -535,8 +534,6 @@
switch (getAccessorTypeIndex(forType)) {
case TYPE_INT_INDEX:
return MH.explicitCastArguments(primitiveGetter, primitiveGetter.type().changeReturnType(int.class));
- case TYPE_LONG_INDEX:
- return primitiveGetter;
case TYPE_DOUBLE_INDEX:
return MH.filterReturnValue(primitiveGetter, UNPACK_DOUBLE);
More information about the distro-pkg-dev
mailing list