OSDN Git Service
Hiroshi Yamauchi [Thu, 17 Mar 2016 23:36:38 +0000 (23:36 +0000)]
Merge changes Ib979b2a4,I35b3fed2,I356acd03 am:
0f1b6b7
am:
db7b8cf
* commit '
db7b8cfebf9fd0a710a12e7a70defa8a794b996e':
Revert "Ignore 145-alloc-tracking-stress run-test failures with CC."
Revert "Ignore 145-alloc-tracking-stress failures in interpreter with CC."
Revert "Ignore 145-alloc-tracking-stress failures with JIT and CC."
Hiroshi Yamauchi [Thu, 17 Mar 2016 23:25:21 +0000 (23:25 +0000)]
Merge changes Ib979b2a4,I35b3fed2,I356acd03
am:
0f1b6b7
* commit '
0f1b6b76e67144349fc0a66c25f0ba13f5efb45a':
Revert "Ignore 145-alloc-tracking-stress run-test failures with CC."
Revert "Ignore 145-alloc-tracking-stress failures in interpreter with CC."
Revert "Ignore 145-alloc-tracking-stress failures with JIT and CC."
Hiroshi Yamauchi [Thu, 17 Mar 2016 23:17:23 +0000 (23:17 +0000)]
Merge changes Ib979b2a4,I35b3fed2,I356acd03
* changes:
Revert "Ignore 145-alloc-tracking-stress run-test failures with CC."
Revert "Ignore 145-alloc-tracking-stress failures in interpreter with CC."
Revert "Ignore 145-alloc-tracking-stress failures with JIT and CC."
Aart Bik [Thu, 17 Mar 2016 23:05:16 +0000 (23:05 +0000)]
Merge "Complete the 1.8 unsafe memory fences tests." am:
0f47487
am:
1343b1d
* commit '
1343b1d0b77a391ab64fba459611d7fcc7606d14':
Complete the 1.8 unsafe memory fences tests.
Aart Bik [Thu, 17 Mar 2016 23:00:42 +0000 (23:00 +0000)]
Merge "Complete the 1.8 unsafe memory fences tests."
am:
0f47487
* commit '
0f474872afa353ac30012e679d77fa622e574d78':
Complete the 1.8 unsafe memory fences tests.
Aart Bik [Thu, 17 Mar 2016 22:52:06 +0000 (22:52 +0000)]
Merge "Complete the 1.8 unsafe memory fences tests."
Hiroshi Yamauchi [Thu, 17 Mar 2016 21:58:20 +0000 (14:58 -0700)]
Revert "Ignore 145-alloc-tracking-stress run-test failures with CC."
This reverts commit
eeed32cd6b9d6949dd1e0ebbea6ea897e58bb2b8.
Bug:
27467554
Hiroshi Yamauchi [Thu, 17 Mar 2016 21:57:58 +0000 (14:57 -0700)]
Revert "Ignore 145-alloc-tracking-stress failures in interpreter with CC."
This reverts commit
fee85561670331f38e0676baadc9be422d3d079c.
Bug:
27467554
Hiroshi Yamauchi [Thu, 17 Mar 2016 21:57:25 +0000 (14:57 -0700)]
Revert "Ignore 145-alloc-tracking-stress failures with JIT and CC."
This reverts commit
3296585f5879a9563214f178f97ee689fc651758.
Bug:
27467554
Change-Id: I356acd036f55605a782a83ab971d9808f10d0ed8
David Srbecky [Thu, 17 Mar 2016 20:34:13 +0000 (20:34 +0000)]
Merge "Do not JIT boot image during native-debugging (keep AOT code instead)." am:
e9e98f1
am:
b8dfff1
* commit '
b8dfff14c6a1c374fe45f94aa0e2f94349892533':
Do not JIT boot image during native-debugging (keep AOT code instead).
David Srbecky [Thu, 17 Mar 2016 20:31:57 +0000 (20:31 +0000)]
Merge "Do not JIT boot image during native-debugging (keep AOT code instead)."
am:
e9e98f1
* commit '
e9e98f12eb5dbe81db90d56c65c8872cabaa855d':
Do not JIT boot image during native-debugging (keep AOT code instead).
David Srbecky [Thu, 17 Mar 2016 20:24:29 +0000 (20:24 +0000)]
Merge "Do not JIT boot image during native-debugging (keep AOT code instead)."
Aart Bik [Fri, 11 Mar 2016 23:37:58 +0000 (15:37 -0800)]
Complete the 1.8 unsafe memory fences tests.
Rationale:
The tests for the fences were still TODO, and this
change list completes them. Java does not quite allow
for a weak memory order on just the signal, but this
is as close as a real unit test as I can think of.
Also added a test suggested by Hans.
BUG=
26264765
Change-Id: I2dcb9b02fa63f72daf4c39b3744ff2010888713e
Alex Light [Thu, 17 Mar 2016 18:50:59 +0000 (18:50 +0000)]
Merge "Revert "Revert "Fix issue with proxy invocation on default methods""" am:
7f3397b
am:
7348116
* commit '
73481167d3553218a9a76e915c6dc5aefba06e62':
Revert "Revert "Fix issue with proxy invocation on default methods""
Alex Light [Thu, 17 Mar 2016 18:50:59 +0000 (18:50 +0000)]
Merge "Make run-test give extra time when doing gc-stress runs." am:
1160f2e
am:
1a33d89
* commit '
1a33d898a40b7a5a943294812a4f5f3af382c7e6':
Make run-test give extra time when doing gc-stress runs.
Alex Light [Thu, 17 Mar 2016 18:07:47 +0000 (18:07 +0000)]
Merge "Revert "Revert "Fix issue with proxy invocation on default methods"""
am:
7f3397b
* commit '
7f3397bec51bdeb7dfe76a17ea9d3279ddf79345':
Revert "Revert "Fix issue with proxy invocation on default methods""
Alex Light [Thu, 17 Mar 2016 18:05:36 +0000 (18:05 +0000)]
Merge "Make run-test give extra time when doing gc-stress runs."
am:
1160f2e
* commit '
1160f2e14d61f95f3fb6bea03acb5451ad926acc':
Make run-test give extra time when doing gc-stress runs.
Alex Light [Thu, 17 Mar 2016 18:02:06 +0000 (18:02 +0000)]
Merge "Revert "Revert "Fix issue with proxy invocation on default methods"""
Alex Light [Thu, 17 Mar 2016 17:53:47 +0000 (17:53 +0000)]
Merge "Make run-test give extra time when doing gc-stress runs."
Hiroshi Yamauchi [Thu, 17 Mar 2016 17:42:27 +0000 (17:42 +0000)]
Merge "Revert "Revert "Assembly TLAB allocation fast path for arm64.""" am:
275f97e
am:
74f6c2e
* commit '
74f6c2ec3631c0afad712bd9c84937b27367b542':
Revert "Revert "Assembly TLAB allocation fast path for arm64.""
Hiroshi Yamauchi [Thu, 17 Mar 2016 17:35:06 +0000 (17:35 +0000)]
Merge "Revert "Revert "Assembly TLAB allocation fast path for arm64."""
am:
275f97e
* commit '
275f97e225f534582b446eb7b9eb00c6757255d9':
Revert "Revert "Assembly TLAB allocation fast path for arm64.""
Calin Juravle [Thu, 17 Mar 2016 17:30:13 +0000 (17:30 +0000)]
Merge "resolve merge conflicts of
c19c1c2 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am:
bce19ce
* commit '
bce19ce7dff918c12604614a5e27d02b78e877a4':
Add ProfileSaver stats and dump them during SigQuit
Hiroshi Yamauchi [Thu, 17 Mar 2016 17:27:11 +0000 (17:27 +0000)]
Merge "Revert "Revert "Assembly TLAB allocation fast path for arm64."""
Calin Juravle [Thu, 17 Mar 2016 17:24:21 +0000 (17:24 +0000)]
Merge "resolve merge conflicts of
c19c1c2 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
Calin Juravle [Thu, 17 Mar 2016 17:22:59 +0000 (17:22 +0000)]
resolve merge conflicts of
c19c1c2 to nyc-dev-plus-aosp
Change-Id: Iac3339e21d94a5d14316f5df2761ab10cdda28d0
Alex Light [Thu, 17 Mar 2016 16:59:38 +0000 (09:59 -0700)]
Make run-test give extra time when doing gc-stress runs.
Some tests (such as 968-default-partial-compile-generated) are running
up against the current timeout when run with gcstress. This increases
the timeout to allow the tests to run fully.
Change-Id: I89ada3affefd09d07c770a83d849f280293cc8ed
Alex Light [Thu, 17 Mar 2016 16:43:28 +0000 (16:43 +0000)]
Merge "Fix bug where verification could crash on unresolved types." am:
3bff678
am:
d344ab3
* commit '
d344ab34612208e466e78b1162214d5ec1f95019':
Fix bug where verification could crash on unresolved types.
Alex Light [Thu, 17 Mar 2016 16:41:09 +0000 (16:41 +0000)]
Merge "Fix bug where verification could crash on unresolved types."
am:
3bff678
* commit '
3bff678d255c9551782a7fdfb356e758585e477d':
Fix bug where verification could crash on unresolved types.
Alex Light [Thu, 17 Mar 2016 16:32:40 +0000 (16:32 +0000)]
Merge "Fix bug where verification could crash on unresolved types."
Alex Light [Wed, 16 Mar 2016 23:09:45 +0000 (16:09 -0700)]
Revert "Revert "Fix issue with proxy invocation on default methods""
This reverts commit
daf58c80d42f024aae0cb94ebd2c0bd61ebbf240.
Bug:
27621360
Change-Id: I56fccf19ae80451be4c316ba14911c667cbe9e47
Sebastien Hertz [Thu, 17 Mar 2016 15:48:48 +0000 (15:48 +0000)]
Re-enable checker tests 536 and 537 am:
7d3ed11
am:
484c346
* commit '
484c34688ccd1ad8b288e5c3fdc8a4a767d36b0f':
Re-enable checker tests 536 and 537
buzbee [Thu, 17 Mar 2016 15:48:48 +0000 (15:48 +0000)]
Merge "ART: Mterp arm64 2-operand double rem fix" into nyc-dev am:
fccd0ae
am:
d82756b
* commit '
d82756b918659da9aeb486bc87c1dde823abcf88':
ART: Mterp arm64 2-operand double rem fix
Alex Light [Thu, 17 Mar 2016 15:48:48 +0000 (15:48 +0000)]
Merge "Revert "Fix issue with proxy invocation on default methods"" into nyc-dev am:
09cd709
am:
e7c5b21
* commit '
e7c5b21ab36afb1364d39dda1c8afa9f3c872132':
Revert "Fix issue with proxy invocation on default methods"
Mathieu Chartier [Thu, 17 Mar 2016 15:48:48 +0000 (15:48 +0000)]
Add verify-art-runtime usage to dex2oat am:
c606870
am:
aaff7ac
* commit '
aaff7ac54a0fcec4fc2b4f0881e2ca7242225b34':
Add verify-art-runtime usage to dex2oat
Alex Light [Thu, 17 Mar 2016 15:48:47 +0000 (15:48 +0000)]
Fix issue with proxy invocation on default methods am:
4b34bf5
am:
0333cbe
* commit '
0333cbe07ac52e2cd1382fb9a731688311f8646c':
Fix issue with proxy invocation on default methods
Sebastien Hertz [Thu, 17 Mar 2016 15:46:24 +0000 (15:46 +0000)]
Re-enable checker tests 536 and 537
am:
7d3ed11
* commit '
7d3ed110398e26b36081924a93ff751d1698ab65':
Re-enable checker tests 536 and 537
buzbee [Thu, 17 Mar 2016 15:46:23 +0000 (15:46 +0000)]
Merge "ART: Mterp arm64 2-operand double rem fix" into nyc-dev
am:
fccd0ae
* commit '
fccd0ae38eca90460218e6ddf0a5b34319079f0a':
ART: Mterp arm64 2-operand double rem fix
Alex Light [Thu, 17 Mar 2016 15:46:23 +0000 (15:46 +0000)]
Merge "Revert "Fix issue with proxy invocation on default methods"" into nyc-dev
am:
09cd709
* commit '
09cd7092d352dae9bc406e4451a239caf0d423e3':
Revert "Fix issue with proxy invocation on default methods"
Mathieu Chartier [Thu, 17 Mar 2016 15:46:23 +0000 (15:46 +0000)]
Add verify-art-runtime usage to dex2oat
am:
c606870
* commit '
c6068709a482065d6f5426640f1c9316797508e3':
Add verify-art-runtime usage to dex2oat
Alex Light [Thu, 17 Mar 2016 15:46:23 +0000 (15:46 +0000)]
Fix issue with proxy invocation on default methods
am:
4b34bf5
* commit '
4b34bf5b242dce5ee20db08b7781bbbaf0d25969':
Fix issue with proxy invocation on default methods
Calin Juravle [Wed, 9 Mar 2016 15:37:48 +0000 (15:37 +0000)]
Add ProfileSaver stats and dump them during SigQuit
Bug:
27516906
Change-Id: I7d2b1091c3523805ef0f87df42feed1098678aad
Nicolas Geoffray [Thu, 17 Mar 2016 14:49:54 +0000 (14:49 +0000)]
Merge "Dump oat file information as part of DumpForSigQuit." am:
e4914ec
am:
d9d9126
* commit '
d9d9126ad588f76fb6485994232f76f7514858f4':
Dump oat file information as part of DumpForSigQuit.
Nicolas Geoffray [Thu, 17 Mar 2016 14:47:40 +0000 (14:47 +0000)]
Merge "Dump oat file information as part of DumpForSigQuit."
am:
e4914ec
* commit '
e4914ec0d83544243257e55d0f0b9da3ed7f147a':
Dump oat file information as part of DumpForSigQuit.
Nicolas Geoffray [Thu, 17 Mar 2016 14:39:13 +0000 (14:39 +0000)]
Merge "Dump oat file information as part of DumpForSigQuit."
Nicolas Geoffray [Thu, 17 Mar 2016 14:31:01 +0000 (14:31 +0000)]
Merge "Fix load store elimination bug in the presence of null[i]." am:
07c4134
am:
dd69e2a
* commit '
dd69e2a9f1c1840947f3a36bf991b47e20cd6a8d':
Fix load store elimination bug in the presence of null[i].
Nicolas Geoffray [Thu, 17 Mar 2016 14:28:49 +0000 (14:28 +0000)]
Merge "Fix load store elimination bug in the presence of null[i]."
am:
07c4134
* commit '
07c4134a759500383bf5931fe12941f48fd051da':
Fix load store elimination bug in the presence of null[i].
Nicolas Geoffray [Thu, 17 Mar 2016 14:20:58 +0000 (14:20 +0000)]
Merge "Fix load store elimination bug in the presence of null[i]."
Nicolas Geoffray [Thu, 17 Mar 2016 11:56:54 +0000 (11:56 +0000)]
Dump oat file information as part of DumpForSigQuit.
Change-Id: Ie8d256d8fa16565105cfe5c39cc96826983469da
Nicolas Geoffray [Thu, 17 Mar 2016 10:44:24 +0000 (10:44 +0000)]
Fix load store elimination bug in the presence of null[i].
Due to the dex specification, we can be in a state where
two array get with the same dex register inputs are typed
differently.
bug:
27683874
Change-Id: Ia821fd32e86c306093372249e7686332a7584263
David Srbecky [Wed, 16 Mar 2016 00:06:24 +0000 (00:06 +0000)]
Do not JIT boot image during native-debugging (keep AOT code instead).
The performance impact is currently significant and being able
to debug framework is not our primary goal for native debugging.
Change-Id: I3366c2a6317004f9dd16700b271a6c9b974f1c6e
Nicolas Geoffray [Thu, 17 Mar 2016 11:00:00 +0000 (11:00 +0000)]
Merge "Check GetDumpNativeStackOnSigQuit() for daemons." am:
0205b58
am:
67ea00d
* commit '
67ea00d16c65d808ca1d753a21432aa8f2f5b6bc':
Check GetDumpNativeStackOnSigQuit() for daemons.
Nicolas Geoffray [Thu, 17 Mar 2016 10:57:46 +0000 (10:57 +0000)]
Merge "Check GetDumpNativeStackOnSigQuit() for daemons."
am:
0205b58
* commit '
0205b58a0d7a9ce5832393857c19c086c78996e9':
Check GetDumpNativeStackOnSigQuit() for daemons.
Nicolas Geoffray [Thu, 17 Mar 2016 10:50:11 +0000 (10:50 +0000)]
Merge "Check GetDumpNativeStackOnSigQuit() for daemons."
Nicolas Geoffray [Thu, 17 Mar 2016 09:35:04 +0000 (09:35 +0000)]
Check GetDumpNativeStackOnSigQuit() for daemons.
The flag is passed by run-test to avoid libunwind crash flakiness,
so we should check it when dumping threads.
Change-Id: I3a3fcfd80ab254a315d58d629c81161fea9900dc
Sebastien Hertz [Wed, 16 Mar 2016 15:20:10 +0000 (16:20 +0100)]
Re-enable checker tests 536 and 537
They were disabled due to a bug in Jack that is fixed now.
Bug:
25635944
(cherry picked from commit
2385d09d254ba3aafb2ee77178f16758e9685682)
Change-Id: I3c21e1dee81a148bf5725dea451bd63c97413fd5
Andreas Gampe [Thu, 17 Mar 2016 01:13:47 +0000 (01:13 +0000)]
Merge "ART: Remember whether the cache was pruned" am:
db1f7da
am:
4a50ac8
* commit '
4a50ac894ca4f5e5e0490c72e9240b798139d9a8':
ART: Remember whether the cache was pruned
Andreas Gampe [Thu, 17 Mar 2016 01:11:28 +0000 (01:11 +0000)]
Merge "ART: Remember whether the cache was pruned"
am:
db1f7da
* commit '
db1f7dac02f6dcecac3e032f10abbcdbf3cf4331':
ART: Remember whether the cache was pruned
Andreas Gampe [Thu, 17 Mar 2016 01:03:54 +0000 (01:03 +0000)]
Merge "ART: Remember whether the cache was pruned"
buzbee [Wed, 16 Mar 2016 23:14:22 +0000 (23:14 +0000)]
Merge "ART: Mterp arm64 2-operand double rem fix" am:
e848c29
am:
515d198
* commit '
515d1983dcecce9701c3c30c37c4e7371b3a180e':
ART: Mterp arm64 2-operand double rem fix
Bill Buzbee [Wed, 16 Mar 2016 23:13:53 +0000 (23:13 +0000)]
Merge "ART: Mterp arm64 2-operand double rem fix" into nyc-dev
buzbee [Wed, 16 Mar 2016 23:12:04 +0000 (23:12 +0000)]
Merge "ART: Mterp arm64 2-operand double rem fix"
am:
e848c29
* commit '
e848c29bb35d91f23bb6f52712aa7f2dff342ea0':
ART: Mterp arm64 2-operand double rem fix
Alex Light [Wed, 16 Mar 2016 23:09:44 +0000 (23:09 +0000)]
Merge "Revert "Fix issue with proxy invocation on default methods"" am:
a67a089
am:
ce3476b
* commit '
ce3476b7796798071f4b8fde0dac66dff865ecbe':
Revert "Fix issue with proxy invocation on default methods"
Alex Light [Wed, 16 Mar 2016 23:07:24 +0000 (23:07 +0000)]
Merge "Revert "Fix issue with proxy invocation on default methods""
am:
a67a089
* commit '
a67a089761ca770aa50122c47c5451a52e7eb807':
Revert "Fix issue with proxy invocation on default methods"
Bill Buzbee [Wed, 16 Mar 2016 23:06:01 +0000 (23:06 +0000)]
Merge "ART: Mterp arm64 2-operand double rem fix"
Hiroshi Yamauchi [Wed, 16 Mar 2016 23:05:09 +0000 (23:05 +0000)]
Merge "Fix valgrind-test-art-host to run both 32-bit and 64-bit tests." am:
08aa5f3
am:
c60f0d6
* commit '
c60f0d6183a726c36c0f6131f63fb9d140d13af5':
Fix valgrind-test-art-host to run both 32-bit and 64-bit tests.
Alex Light [Wed, 16 Mar 2016 23:02:59 +0000 (23:02 +0000)]
Merge "Revert "Fix issue with proxy invocation on default methods""
Hiroshi Yamauchi [Wed, 16 Mar 2016 23:02:52 +0000 (23:02 +0000)]
Merge "Fix valgrind-test-art-host to run both 32-bit and 64-bit tests."
am:
08aa5f3
* commit '
08aa5f3086a1c0f6f4839a73535ecf3a55cfae8c':
Fix valgrind-test-art-host to run both 32-bit and 64-bit tests.
Alex Light [Wed, 16 Mar 2016 23:00:49 +0000 (23:00 +0000)]
Revert "Fix issue with proxy invocation on default methods"
This reverts commit
ec3b7ab8f008f36f1072d4ba03da204229b95976.
Change-Id: Idfb2c63c246cc5dae7670503e70ad3f62bb1e1eb
Alex Light [Wed, 16 Mar 2016 23:00:24 +0000 (23:00 +0000)]
Merge "Revert "Fix issue with proxy invocation on default methods"" into nyc-dev
Alex Light [Wed, 16 Mar 2016 22:59:42 +0000 (22:59 +0000)]
Revert "Fix issue with proxy invocation on default methods"
This reverts commit
4b34bf5b242dce5ee20db08b7781bbbaf0d25969.
Change-Id: If072fdbaafd0ee1877e8281a83ba4a598adb3355
Hiroshi Yamauchi [Wed, 16 Mar 2016 22:55:50 +0000 (22:55 +0000)]
Merge "Fix valgrind-test-art-host to run both 32-bit and 64-bit tests."
buzbee [Wed, 16 Mar 2016 21:39:50 +0000 (14:39 -0700)]
ART: Mterp arm64 2-operand double rem fix
An instruction ordering bug caused 2-operand double-precision
rem operations to be performed incorrectly on the arm64 fast
interpreter. Also, fixes the existing omnibus-opcodes smoke test
to better catch 2-operand float and double operation problems
(the problem was masked in the existing test).
Bug:
27604215
(cherry picked from commit
908c0b28517c2d21f9ddd231e91cdd2c339aeb16)
Change-Id: I1856d914a0cb76c6034d0c0e021525b095e33452
Mathieu Chartier [Wed, 16 Mar 2016 22:12:49 +0000 (22:12 +0000)]
Merge "Add verify-art-runtime usage to dex2oat" am:
9ee48fb
am:
669a45a
* commit '
669a45aed9caa9491e7413f5a16002d196db2033':
Add verify-art-runtime usage to dex2oat
Mathieu Chartier [Wed, 16 Mar 2016 22:09:59 +0000 (22:09 +0000)]
Merge "Add verify-art-runtime usage to dex2oat"
am:
9ee48fb
* commit '
9ee48fbf7395488ea34d7d268edb31d7abe4ebe9':
Add verify-art-runtime usage to dex2oat
Mathieu Chartier [Wed, 16 Mar 2016 22:02:20 +0000 (22:02 +0000)]
Merge "Add verify-art-runtime usage to dex2oat"
Mathieu Chartier [Wed, 16 Mar 2016 21:29:17 +0000 (14:29 -0700)]
Add verify-art-runtime usage to dex2oat
Bug:
27688793
(cherry picked from commit
c6068709a482065d6f5426640f1c9316797508e3)
Change-Id: Idcf6b8023a15c816168ce42456d2bd7b463d0951
buzbee [Wed, 16 Mar 2016 21:39:50 +0000 (14:39 -0700)]
ART: Mterp arm64 2-operand double rem fix
An instruction ordering bug caused 2-operand double-precision
rem operations to be performed incorrectly on the arm64 fast
interpreter. Also, fixes the existing omnibus-opcodes smoke test
to better catch 2-operand float and double operation problems
(the problem was masked in the existing test).
Bug:
27604215
Change-Id: I9fac1e61d9defe7d623c611406c35921abb65b04
Alex Light [Tue, 15 Mar 2016 16:50:26 +0000 (09:50 -0700)]
Fix bug where verification could crash on unresolved types.
Bug:
27626708
Change-Id: I708ee18215dccadc00ff3daa1e01c2830475ccae
Mathieu Chartier [Wed, 16 Mar 2016 21:29:17 +0000 (14:29 -0700)]
Add verify-art-runtime usage to dex2oat
Bug:
27688793
Change-Id: I290f59df003ba241a6b71fb628351312b431ec4c
Mathieu Chartier [Wed, 16 Mar 2016 21:15:14 +0000 (21:15 +0000)]
Merge "Fix race in AllocEntrypointsInstrumented" am:
6f1b7ec
am:
55d89b8
* commit '
55d89b8ab9c8e71ae61c88f84cbba4949a6ff64a':
Fix race in AllocEntrypointsInstrumented
Mathieu Chartier [Wed, 16 Mar 2016 21:12:52 +0000 (21:12 +0000)]
Merge "Fix race in AllocEntrypointsInstrumented"
am:
6f1b7ec
* commit '
6f1b7ecf61a7be88bcbb259726e99a78a7235d15':
Fix race in AllocEntrypointsInstrumented
Mathieu Chartier [Wed, 16 Mar 2016 21:07:31 +0000 (21:07 +0000)]
Merge "Fix race in AllocEntrypointsInstrumented"
Alex Light [Tue, 15 Mar 2016 18:35:18 +0000 (11:35 -0700)]
Fix issue with proxy invocation on default methods
Bug:
27621360
(cherry picked from commit
ec3b7ab8f008f36f1072d4ba03da204229b95976)
Change-Id: I617eee243f475872235fd75b6a401e056111ea23
Hiroshi Yamauchi [Wed, 16 Mar 2016 18:23:10 +0000 (11:23 -0700)]
Revert "Revert "Assembly TLAB allocation fast path for arm64.""
This reverts commit
52fa2c698b995c21940f366cf3a44204ddf4f8e9.
Fix the mvn instructions.
Bug:
9986565
Change-Id: Ib7b2023cd54c57131442e1de85c64f40b818313d
Alex Light [Wed, 16 Mar 2016 20:48:59 +0000 (20:48 +0000)]
Merge "Fix issue with proxy invocation on default methods" am:
932e6bf
am:
8eac39e
* commit '
8eac39ea40664e48965782e9b615632e4e23a0eb':
Fix issue with proxy invocation on default methods
Alex Light [Wed, 16 Mar 2016 20:46:08 +0000 (20:46 +0000)]
Merge "Fix issue with proxy invocation on default methods"
am:
932e6bf
* commit '
932e6bf238a00ae9813e91acb7249cb063fab205':
Fix issue with proxy invocation on default methods
Alex Light [Wed, 16 Mar 2016 20:39:54 +0000 (20:39 +0000)]
Merge "Fix issue with proxy invocation on default methods"
Mathieu Chartier [Wed, 16 Mar 2016 20:39:14 +0000 (20:39 +0000)]
Fix race in AllocEntrypointsInstrumented am:
77d9931
am:
56626ba
* commit '
56626babd4b3445b1ea39f826efa9b791ec743b5':
Fix race in AllocEntrypointsInstrumented
Mathieu Chartier [Wed, 16 Mar 2016 20:36:58 +0000 (20:36 +0000)]
Fix race in AllocEntrypointsInstrumented
am:
77d9931
* commit '
77d993107773b7b9bd7f07ce08d0aaac1631bf84':
Fix race in AllocEntrypointsInstrumented
Mathieu Chartier [Wed, 16 Mar 2016 18:25:29 +0000 (11:25 -0700)]
Fix race in AllocEntrypointsInstrumented
We were using the quick_alloc_entry_points_instrumentation_counter_,
this counter is updated before the threads are suspended. The
allocator could come out of a suspend point, see that threads are
supposedly still no instrumented, continue the allocation, then
suddenly quick_alloc_entry_points_instrumentation_counter_ becomes
1 and alloc_tracking_enabled_ becomes true resulting in a failing
DCHECK.
The fix is to add a boolean that is updated only when the threads
are suspended.
Bug:
27506909
(cherry picked from commit
77d993107773b7b9bd7f07ce08d0aaac1631bf84)
Change-Id: Id12983ef77c4fddb0394e4439ce0829777f1a70b
Mathieu Chartier [Wed, 16 Mar 2016 18:25:29 +0000 (11:25 -0700)]
Fix race in AllocEntrypointsInstrumented
We were using the quick_alloc_entry_points_instrumentation_counter_,
this counter is updated before the threads are suspended. The
allocator could come out of a suspend point, see that threads are
supposedly still no instrumented, continue the allocation, then
suddenly quick_alloc_entry_points_instrumentation_counter_ becomes
1 and alloc_tracking_enabled_ becomes true resulting in a failing
DCHECK.
The fix is to add a boolean that is updated only when the threads
are suspended.
Bug:
27506909
Change-Id: Ic3c6716d2af9c00189ce9271f7a2825b03cdd8a0
David Srbecky [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Remove --native-debuggable compiler option." am:
8e57978
am:
15d3f56
* commit '
15d3f562fb91937dc80a6c66b99b928bbdeb43e2':
Remove --native-debuggable compiler option.
Roland Levillain [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Make art::HCompare support boolean, byte, short and char inputs." am:
03fdc90
am:
dd6a628
* commit '
dd6a6285dd19308df1fa70e20b85c41773af352e':
Make art::HCompare support boolean, byte, short and char inputs.
Nicolas Geoffray [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Forgot space." am:
1a738fc
am:
6dab0aa
* commit '
6dab0aa66bdea34a694df32e664dd54cf9718a58':
Forgot space.
Narayan Kamath [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "runtime: delete native/java_lang_Runtime.h." am:
615017b
am:
f16d2d3
* commit '
f16d2d3c1d35f7d8fec782b86d6ab2e87a632404':
runtime: delete native/java_lang_Runtime.h.
Nicolas Geoffray [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Fix inliner crash related to type propagation." am:
8b5e04b
am:
e6f5e34
* commit '
e6f5e34a0cacf21ad4e71e916271f9137442f63f':
Fix inliner crash related to type propagation.
Sebastien Hertz [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Re-enable checker tests 536 and 537" am:
713c519
am:
f098d40
* commit '
f098d403e4c37042b3c00b88a56356a2565c3515':
Re-enable checker tests 536 and 537
David Srbecky [Wed, 16 Mar 2016 18:54:39 +0000 (18:54 +0000)]
Merge "Remove --native-debuggable compiler option."
am:
8e57978
* commit '
8e57978b5f330a322f05644c2db7fa8ce89b1b46':
Remove --native-debuggable compiler option.
Roland Levillain [Wed, 16 Mar 2016 18:54:39 +0000 (18:54 +0000)]
Merge "Make art::HCompare support boolean, byte, short and char inputs."
am:
03fdc90
* commit '
03fdc90721a1874a4aef9adfd8fc1b9b4b4bc249':
Make art::HCompare support boolean, byte, short and char inputs.
Nicolas Geoffray [Wed, 16 Mar 2016 18:54:39 +0000 (18:54 +0000)]
Merge "Forgot space."
am:
1a738fc
* commit '
1a738fc659a7b91456b168d2ee1edcd9eb777569':
Forgot space.
OSDN Git Service
