OSDN Git Service
Narayan Kamath [Mon, 22 Jun 2015 11:52:58 +0000 (11:52 +0000)]
am
6a5c58e5: am
a63d8f44: Merge "fault_handler : debug output sp in hex and not decimal."
* commit '
6a5c58e575f3863646bab2406e0091308da39bb6':
fault_handler : debug output sp in hex and not decimal.
Narayan Kamath [Mon, 22 Jun 2015 11:42:49 +0000 (11:42 +0000)]
am
a63d8f44: Merge "fault_handler : debug output sp in hex and not decimal."
* commit '
a63d8f44740a8406adda6aaff7ed75ef923c085f':
fault_handler : debug output sp in hex and not decimal.
Nicolas Geoffray [Mon, 22 Jun 2015 11:38:01 +0000 (11:38 +0000)]
Merge "resolved conflicts for merge of
15621f64 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
Nicolas Geoffray [Mon, 22 Jun 2015 11:35:04 +0000 (12:35 +0100)]
resolved conflicts for merge of
15621f64 to mnc-dev-plus-aosp
Change-Id: I1fc73beebbf842f494b2b414dee2e5d8a2fa5794
Nicolas Geoffray [Mon, 22 Jun 2015 11:29:05 +0000 (11:29 +0000)]
am
a4d847f4: am
c9345cc2: Merge "Fix wrong DCHECK in bounds check elimination." into mnc-dev
* commit '
a4d847f4a260a0e1d8d204fa287680bfe6243d7b':
Fix wrong DCHECK in bounds check elimination.
Narayan Kamath [Mon, 22 Jun 2015 11:28:17 +0000 (11:28 +0000)]
Merge "fault_handler : debug output sp in hex and not decimal."
Narayan Kamath [Fri, 19 Jun 2015 14:23:46 +0000 (15:23 +0100)]
fault_handler : debug output sp in hex and not decimal.
Easier to compare against hex values in tombstones and debuggerd
dumps.
Change-Id: I4a4512ea1ce5872fdb6b41e824fa3475dfcfb71d
Nicolas Geoffray [Mon, 22 Jun 2015 11:27:17 +0000 (11:27 +0000)]
Merge "resolved conflicts for merge of
49b8352b to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
Nicolas Geoffray [Mon, 22 Jun 2015 11:26:41 +0000 (12:26 +0100)]
resolved conflicts for merge of
49b8352b to mnc-dev-plus-aosp
Change-Id: I90e06186b7e463290a766a96730c0a7702306f67
Nicolas Geoffray [Mon, 22 Jun 2015 11:24:34 +0000 (11:24 +0000)]
am
398ed3bd: am
ae370391: Merge "Use compiling class instead of outer class for access checks."
* commit '
398ed3bd7ba0050dae4849226bb9191f1f69543f':
Use compiling class instead of outer class for access checks.
David Brazdil [Mon, 22 Jun 2015 11:24:33 +0000 (11:24 +0000)]
am
df0abd93: am
a948b1a0: Merge "Opt compiler: Add disassembly to the \'.cfg\' output."
* commit '
df0abd93d979d1e46ff6840077f0df018b0a99ef':
Opt compiler: Add disassembly to the '.cfg' output.
Nicolas Geoffray [Mon, 22 Jun 2015 11:16:42 +0000 (11:16 +0000)]
am
ae370391: Merge "Use compiling class instead of outer class for access checks."
* commit '
ae370391057b88607b0e451fdea020b257684b91':
Use compiling class instead of outer class for access checks.
David Brazdil [Mon, 22 Jun 2015 11:10:39 +0000 (11:10 +0000)]
am
a948b1a0: Merge "Opt compiler: Add disassembly to the \'.cfg\' output."
* commit '
a948b1a0a917b9fd4bbd10a5ba4823594b78373d':
Opt compiler: Add disassembly to the '.cfg' output.
Nicolas Geoffray [Mon, 22 Jun 2015 11:09:24 +0000 (11:09 +0000)]
Merge "Use compiling class instead of outer class for access checks."
David Brazdil [Mon, 22 Jun 2015 10:58:32 +0000 (10:58 +0000)]
Merge "Opt compiler: Add disassembly to the '.cfg' output."
Alexandre Rames [Fri, 19 Jun 2015 13:47:01 +0000 (14:47 +0100)]
Opt compiler: Add disassembly to the '.cfg' output.
This is automatically added to the '.cfg' output when using the usual
`--dump-cfg` option.
Change-Id: I864bfc3a8299c042e72e451cc7730ad8271e4deb
David Brazdil [Mon, 22 Jun 2015 10:35:51 +0000 (10:35 +0000)]
am
605823c3: am
8ec0e203: Merge "ART: Simplify (Not)Equal bool vs. int to true/false"
* commit '
605823c344a532d175b188d3656a28c6a8db5c6a':
ART: Simplify (Not)Equal bool vs. int to true/false
Nicolas Geoffray [Mon, 22 Jun 2015 10:30:07 +0000 (10:30 +0000)]
am
4b730816: am
0f0be726: Merge "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
* commit '
4b7308163995d8592612a54b859f3006b2bd4648':
Revert "Use IsAssignableFrom instead of IsSubclass for robustness."
David Brazdil [Mon, 22 Jun 2015 10:28:02 +0000 (10:28 +0000)]
am
8ec0e203: Merge "ART: Simplify (Not)Equal bool vs. int to true/false"
* commit '
8ec0e20347e13592539a8c0786b1db1735149800':
ART: Simplify (Not)Equal bool vs. int to true/false
Nicolas Geoffray [Mon, 22 Jun 2015 10:17:26 +0000 (10:17 +0000)]
am
0f0be726: Merge "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
* commit '
0f0be7261c68ebb701677b70d40e373accef4d09':
Revert "Use IsAssignableFrom instead of IsSubclass for robustness."
David Brazdil [Mon, 22 Jun 2015 10:16:45 +0000 (10:16 +0000)]
Merge "ART: Simplify (Not)Equal bool vs. int to true/false"
David Brazdil [Mon, 22 Jun 2015 09:26:45 +0000 (10:26 +0100)]
ART: Simplify (Not)Equal bool vs. int to true/false
Optimizations on the HGraph may produce comparisons of bool and ints.
Instruction simplifier will simplify these only for 0/1 int constants.
Since the range of bool is known, comparison against all other int
constants can always be determined statically.
Change-Id: I502651b7a08edf71ee0b2589069f00def6aacf66
Nicolas Geoffray [Mon, 22 Jun 2015 10:05:58 +0000 (10:05 +0000)]
Merge "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Nicolas Geoffray [Mon, 22 Jun 2015 10:04:29 +0000 (10:04 +0000)]
Revert "Use IsAssignableFrom instead of IsSubclass for robustness."
Not correct for Quick.
Bug:
21870666
This reverts commit
af268bbc4fbd0b9847acf1f7b79c038806118467.
Change-Id: Id44849cc877a42495619fd71bfd2db75159b6868
Nicolas Geoffray [Mon, 22 Jun 2015 09:46:31 +0000 (09:46 +0000)]
am
ed286710: am
ff82263e: Fix String Change baseline compiler errors.
* commit '
ed286710a5d6b0316ce632ed861daff06f958f1c':
Fix String Change baseline compiler errors.
Nicolas Geoffray [Mon, 22 Jun 2015 09:38:39 +0000 (09:38 +0000)]
am
096f357c: Merge "Bailout from compilation if an invoke is malformed." into mnc-dev
* commit '
096f357c5dda663c6fbb58bd0154c091aec51f63':
Bailout from compilation if an invoke is malformed.
Nicolas Geoffray [Mon, 22 Jun 2015 09:38:38 +0000 (09:38 +0000)]
am
c9345cc2: Merge "Fix wrong DCHECK in bounds check elimination." into mnc-dev
* commit '
c9345cc258d6a4e164b7e64ee1e67e69a180b972':
Fix wrong DCHECK in bounds check elimination.
Nicolas Geoffray [Mon, 22 Jun 2015 09:38:37 +0000 (09:38 +0000)]
am
25fde612: Fix a bug in optimizing when the null constant has been DCE.
* commit '
25fde612b0df01a086cd4c801b7bd3a10e93a0e9':
Fix a bug in optimizing when the null constant has been DCE.
Nicolas Geoffray [Mon, 22 Jun 2015 09:38:36 +0000 (09:38 +0000)]
am
ff82263e: Fix String Change baseline compiler errors.
* commit '
ff82263e2b96ad099c56c19b91c2286baaf82fa7':
Fix String Change baseline compiler errors.
Nicolas Geoffray [Mon, 22 Jun 2015 09:34:02 +0000 (09:34 +0000)]
am
ce5b7bfc: am
e85647ed: Merge "Use IsAssignableFrom instead of IsSubclass for robustness."
* commit '
ce5b7bfcf5d5ec48f3d75d879e09a663ad32b209':
Use IsAssignableFrom instead of IsSubclass for robustness.
Nicolas Geoffray [Mon, 22 Jun 2015 09:34:01 +0000 (09:34 +0000)]
am
5a784473: am
8cf7cbf7: Merge "Fix wrong DCHECK in bounds check elimination."
* commit '
5a7844734935a9c58859230afbe402f8db1e3d71':
Fix wrong DCHECK in bounds check elimination.
Nicolas Geoffray [Mon, 22 Jun 2015 09:25:56 +0000 (09:25 +0000)]
Merge "Bailout from compilation if an invoke is malformed." into mnc-dev
Nicolas Geoffray [Thu, 18 Jun 2015 10:11:27 +0000 (11:11 +0100)]
Bailout from compilation if an invoke is malformed.
Because the verifier does not check trivially dead instructions,
the compilers must prepare for bogus instructions. This change
fixes the case the arguments for an invoke do not match the
formal parameters.
bug:
21865459
(cherry picked from commit
2e33525bd4eb892246b4c244c6d4ebf6c6d07501)
Change-Id: I392f86eafefde28263fe35a31f17b398ff8dfc24
Nicolas Geoffray [Mon, 22 Jun 2015 09:16:04 +0000 (09:16 +0000)]
Merge "Fix wrong DCHECK in bounds check elimination." into mnc-dev
Nicolas Geoffray [Sat, 20 Jun 2015 22:49:01 +0000 (23:49 +0100)]
Fix wrong DCHECK in bounds check elimination.
The lower range of an array length instruction can
be changed by other instructions than HBoundsCheck,
like HNewArray.
bug:
21862741
(cherry picked from commit
8d82a0c2b2b12f259ccb357d3b1e699c68ad0400)
Change-Id: I1bb1a4f4c6673509dd3fb5184c32992bed876250
Nicolas Geoffray [Sat, 20 Jun 2015 21:44:47 +0000 (22:44 +0100)]
Use compiling class instead of outer class for access checks.
bug:
21869678
Change-Id: Ica6ecc759adc76950dcfe9d4d859dd593a742c62
Nicolas Geoffray [Wed, 17 Jun 2015 22:09:05 +0000 (23:09 +0100)]
Fix a bug in optimizing when the null constant has been DCE.
If it has been DCE, we should create a new one, instead of
using the old one.
Also move the first DCE to a place where it could actually
be useful.
bug:
21870788
(cherry picked from commit
18e6873c469b48aaed22148451523479eece98e3)
Change-Id: I3b3ab2dafe8ce5fb60868fd1a6ef0eeefe666e0c
Nicolas Geoffray [Mon, 22 Jun 2015 08:00:51 +0000 (08:00 +0000)]
am
e85647ed: Merge "Use IsAssignableFrom instead of IsSubclass for robustness."
* commit '
e85647ed00d07169193cc07ffa09e3b70ce38f59':
Use IsAssignableFrom instead of IsSubclass for robustness.
Nicolas Geoffray [Mon, 22 Jun 2015 08:00:50 +0000 (08:00 +0000)]
am
8cf7cbf7: Merge "Fix wrong DCHECK in bounds check elimination."
* commit '
8cf7cbf7854199cfd5001fa9503c78c3b15f0b58':
Fix wrong DCHECK in bounds check elimination.
Nicolas Geoffray [Sun, 21 Jun 2015 17:57:02 +0000 (18:57 +0100)]
Fix String Change baseline compiler errors.
The String Change adds multiple move results if the uninitialized string
is in multiple registers. This adds StoreLocals on the same instruction,
which isn't allowed. Now, a LoadLocal is added for each extra move
needed.
bug:
21902634
(cherry picked from commit
aa919207d2fb63af11d72d3b7cdbc435769565af)
Change-Id: I057d14cdac437d06eec20caaddd430c304e58196
Nicolas Geoffray [Mon, 22 Jun 2015 07:53:43 +0000 (07:53 +0000)]
Merge "Use IsAssignableFrom instead of IsSubclass for robustness."
Nicolas Geoffray [Mon, 22 Jun 2015 07:52:58 +0000 (07:52 +0000)]
Merge "Fix wrong DCHECK in bounds check elimination."
Nicolas Geoffray [Mon, 22 Jun 2015 07:49:24 +0000 (07:49 +0000)]
am
b4688335: am
7aa55725: Merge "Fix String Change baseline compiler errors."
* commit '
b4688335b7275dcde8582ba44f0bf1ab4437cff7':
Fix String Change baseline compiler errors.
Nicolas Geoffray [Mon, 22 Jun 2015 07:42:44 +0000 (07:42 +0000)]
am
7aa55725: Merge "Fix String Change baseline compiler errors."
* commit '
7aa557256a87a8a7ad4be7d9ff90aee54a99124c':
Fix String Change baseline compiler errors.
Nicolas Geoffray [Mon, 22 Jun 2015 07:32:14 +0000 (07:32 +0000)]
Merge "Fix String Change baseline compiler errors."
Nicolas Geoffray [Sun, 21 Jun 2015 17:57:02 +0000 (18:57 +0100)]
Fix String Change baseline compiler errors.
The String Change adds multiple move results if the uninitialized string
is in multiple registers. This adds StoreLocals on the same instruction,
which isn't allowed. Now, a LoadLocal is added for each extra move
needed.
Change-Id: I49f676cb85de051e737e0653138cbb947a73e48b
Brian Carlstrom [Sun, 21 Jun 2015 00:29:35 +0000 (00:29 +0000)]
am
6be9c366: am
74f774f0: Merge "Make dump-oat-target work with second architecture"
* commit '
6be9c366b59f7371334c7e88c611f99907aa3689':
Make dump-oat-target work with second architecture
Brian Carlstrom [Sun, 21 Jun 2015 00:17:24 +0000 (00:17 +0000)]
am
74f774f0: Merge "Make dump-oat-target work with second architecture"
* commit '
74f774f0d6389c432122ca262c6705118f5ebd6e':
Make dump-oat-target work with second architecture
Brian Carlstrom [Sun, 21 Jun 2015 00:08:20 +0000 (00:08 +0000)]
Merge "Make dump-oat-target work with second architecture"
Nicolas Geoffray [Sat, 20 Jun 2015 22:49:01 +0000 (23:49 +0100)]
Fix wrong DCHECK in bounds check elimination.
The lower range of an array length instruction can
be changed by other instructions than HBoundsCheck,
like HNewArray.
bug:
21862741
Change-Id: Idbe50ac114287ea6d852fb6fe9f9e2d440d18af5
David Srbecky [Sat, 20 Jun 2015 06:16:23 +0000 (06:16 +0000)]
am
44beb33f: am
883ac209: Merge "Move LD_USE_LOAD_BIAS to run-test-jar to reduce log verbosity."
* commit '
44beb33fac4e75574b8d66a4702d20c30983593c':
Move LD_USE_LOAD_BIAS to run-test-jar to reduce log verbosity.
David Srbecky [Sat, 20 Jun 2015 06:04:40 +0000 (06:04 +0000)]
am
883ac209: Merge "Move LD_USE_LOAD_BIAS to run-test-jar to reduce log verbosity."
* commit '
883ac209066d61404627a8820770755d60068a2b':
Move LD_USE_LOAD_BIAS to run-test-jar to reduce log verbosity.
David Srbecky [Sat, 20 Jun 2015 05:58:58 +0000 (05:58 +0000)]
am
7060f281: am
7257ece4: Use signed encoding when using relative CFI addresses.
* commit '
7060f2812b6eca80968a7480698fe943c276e90c':
Use signed encoding when using relative CFI addresses.
David Srbecky [Sat, 20 Jun 2015 05:56:48 +0000 (05:56 +0000)]
Merge "Move LD_USE_LOAD_BIAS to run-test-jar to reduce log verbosity."
David Srbecky [Sat, 20 Jun 2015 05:46:48 +0000 (05:46 +0000)]
am
7257ece4: Use signed encoding when using relative CFI addresses.
* commit '
7257ece418469b284ae3cf1d9ba6617a62bdfc4f':
Use signed encoding when using relative CFI addresses.
David Srbecky [Sat, 20 Jun 2015 05:03:53 +0000 (06:03 +0100)]
Move LD_USE_LOAD_BIAS to run-test-jar to reduce log verbosity.
LD_USE_LOAD_BIAS is needed so that we can use dlopen.
Without it, we will fallback to our own loader and
dump all mmap for diagnostics which makes the tests verbose.
Change-Id: Ib12e9834b3454ffd726642859550545826ce38bf
Brian Carlstrom [Sat, 20 Jun 2015 05:05:35 +0000 (22:05 -0700)]
Make dump-oat-target work with second architecture
Bug:
19909409
Change-Id: Iff21c5d3ce0e6b057a677da6726ee42af64463e7
David Srbecky [Sat, 20 Jun 2015 04:53:44 +0000 (04:53 +0000)]
am
40ae4519: am
1e73a95d: Merge "Use signed encoding when using relative CFI addresses."
* commit '
40ae45194aa92f2fea952e1aaa407419451f31a1':
Use signed encoding when using relative CFI addresses.
David Srbecky [Sat, 20 Jun 2015 04:40:51 +0000 (04:40 +0000)]
am
1e73a95d: Merge "Use signed encoding when using relative CFI addresses."
* commit '
1e73a95d74848020fab512a95a7f9a7ada72497b':
Use signed encoding when using relative CFI addresses.
Andreas Gampe [Sat, 20 Jun 2015 04:33:58 +0000 (04:33 +0000)]
am
73ad9401: am
673b4302: ART: Check for expected args for instance methods
* commit '
73ad9401d93bdbfe51b00e51361e4ecd2047aac5':
ART: Check for expected args for instance methods
David Srbecky [Sat, 20 Jun 2015 04:01:22 +0000 (05:01 +0100)]
Use signed encoding when using relative CFI addresses.
This is required for gdb to work.
libunwind works with either encoding.
(cherry picked from commit
17065880693d1b15ffeb60b9955a2d092839977f)
Bug:
21924613
Change-Id: I4e4f1cf9c65d48fa885a5993eeeed0253a3f2579
David Srbecky [Sat, 20 Jun 2015 04:30:29 +0000 (04:30 +0000)]
Merge "Use signed encoding when using relative CFI addresses."
Andreas Gampe [Sat, 20 Jun 2015 04:23:49 +0000 (04:23 +0000)]
am
46cbfe60: am
a60bd747: Merge "ART: Check for expected args for instance methods"
* commit '
46cbfe60a615bc1ea8e8580b2111477211edb1cb':
ART: Check for expected args for instance methods
Andreas Gampe [Sat, 20 Jun 2015 04:23:45 +0000 (04:23 +0000)]
am
673b4302: ART: Check for expected args for instance methods
* commit '
673b4302edf6d1604e69a1427eea5324016bbab2':
ART: Check for expected args for instance methods
Andreas Gampe [Sat, 20 Jun 2015 04:11:47 +0000 (04:11 +0000)]
am
a60bd747: Merge "ART: Check for expected args for instance methods"
* commit '
a60bd74737fcd1b3737bc523741efa1097bbd782':
ART: Check for expected args for instance methods
David Srbecky [Sat, 20 Jun 2015 04:01:22 +0000 (05:01 +0100)]
Use signed encoding when using relative CFI addresses.
This is required for gdb to work.
libunwind works with either encoding.
Bug:
21924613
Change-Id: I4e4f1cf9c65d48fa885a5993eeeed0253a3f2579
Andreas Gampe [Sat, 20 Jun 2015 03:37:46 +0000 (20:37 -0700)]
ART: Check for expected args for instance methods
Don't assume that the receiver is expected. This was writing out
of bounds (or triggering a DCHECK).
Bug:
21817284
Bug:
21872240
Bug: https://code.google.com/p/android/issues/detail?id=176571
Bug: https://code.google.com/p/android/issues/detail?id=176572
(cherry picked from commit
ef0b1a1dbc99fe7c92f9598cbfc164763c1b66d7)
Change-Id: I7cad2c1dfc39feb0b1b4660deeb43afdcb844ba3
Andreas Gampe [Sat, 20 Jun 2015 04:03:20 +0000 (04:03 +0000)]
Merge "ART: Check for expected args for instance methods"
Andreas Gampe [Sat, 20 Jun 2015 03:37:46 +0000 (20:37 -0700)]
ART: Check for expected args for instance methods
Don't assume that the receiver is expected. This was writing out
of bounds (or triggering a DCHECK).
Bug:
21817284
Bug:
21872240
Bug: https://code.google.com/p/android/issues/detail?id=176571
Bug: https://code.google.com/p/android/issues/detail?id=176572
Change-Id: I7cad2c1dfc39feb0b1b4660deeb43afdcb844ba3
Taiju Tsuiki [Sat, 20 Jun 2015 02:10:38 +0000 (02:10 +0000)]
am
3c0ea8b9: am
cbf5d896: ART: Check var-arg count earlier in method verifier
* commit '
3c0ea8b951827a3c4ce1714b610c45870f837257':
ART: Check var-arg count earlier in method verifier
Taiju Tsuiki [Sat, 20 Jun 2015 01:59:01 +0000 (01:59 +0000)]
am
cbf5d896: ART: Check var-arg count earlier in method verifier
* commit '
cbf5d89665cfb48778b2946794fbea43067ff04a':
ART: Check var-arg count earlier in method verifier
Taiju Tsuiki [Mon, 13 Apr 2015 05:21:00 +0000 (14:21 +0900)]
ART: Check var-arg count earlier in method verifier
Check the count in vararg instructions before filling the temp
array. Avoids a DCHECK.
Bug:
21869663
Bug:
20170976
(cherry picked from commit
29498a23bcfe47a7134552aacad5524ecb484a49)
Change-Id: I1ff93502ab84c5967ad54d1b50dba517da791637
Andreas Gampe [Sat, 20 Jun 2015 01:10:09 +0000 (01:10 +0000)]
am
8add5831: am
ba7837b2: Merge "ART: Check var-arg count earlier in method verifier"
* commit '
8add5831e6d129b13252c861f7d9c024ec50a46a':
ART: Check var-arg count earlier in method verifier
Andreas Gampe [Sat, 20 Jun 2015 00:54:49 +0000 (00:54 +0000)]
am
ba7837b2: Merge "ART: Check var-arg count earlier in method verifier"
* commit '
ba7837b2308aeaaa613383297737488af558aed7':
ART: Check var-arg count earlier in method verifier
Andreas Gampe [Sat, 20 Jun 2015 00:43:39 +0000 (00:43 +0000)]
Merge "ART: Check var-arg count earlier in method verifier"
Taiju Tsuiki [Mon, 13 Apr 2015 05:21:00 +0000 (14:21 +0900)]
ART: Check var-arg count earlier in method verifier
Check the count in vararg instructions before filling the temp
array. Avoids a DCHECK.
Bug:
21869663
Bug:
20170976
Change-Id: I1ff93502ab84c5967ad54d1b50dba517da791637
Mingyao Yang [Sat, 20 Jun 2015 00:10:29 +0000 (00:10 +0000)]
am
d7f7bf7f: am
1bd841a2: Merge "ART: Fix BCE lint issue" into mnc-dev
* commit '
d7f7bf7fea3b09bd0549bdf99e98b84a69157585':
ART: Fix BCE lint issue
Mingyao Yang [Fri, 19 Jun 2015 23:57:31 +0000 (23:57 +0000)]
am
1bd841a2: Merge "ART: Fix BCE lint issue" into mnc-dev
* commit '
1bd841a26a0810decbd3cd9dcc3c0dca5773dc2b':
ART: Fix BCE lint issue
Mingyao Yang [Fri, 19 Jun 2015 23:45:43 +0000 (23:45 +0000)]
Merge "ART: Fix BCE lint issue" into mnc-dev
Andreas Gampe [Thu, 11 Jun 2015 01:33:26 +0000 (18:33 -0700)]
ART: Fix BCE lint issue
Bug:
21034044
(cherry picked from commit
45d68f138a31a3ff9b45cda313f0ba27f1431f26)
Change-Id: I7f382a3124955eff5c0b96ca39ec67fb658fa3d0
Mathieu Chartier [Fri, 19 Jun 2015 23:07:56 +0000 (23:07 +0000)]
am
ffb24af9: am
d1a06338: Merge "Fix GC map generation edge case"
* commit '
ffb24af928edfa4cbd76d8e10ac5d302a86f7947':
Fix GC map generation edge case
Mathieu Chartier [Fri, 19 Jun 2015 22:54:44 +0000 (22:54 +0000)]
am
d1a06338: Merge "Fix GC map generation edge case"
* commit '
d1a06338b9aa818b730ef1d46549a09af8f35c5b':
Fix GC map generation edge case
Mathieu Chartier [Fri, 19 Jun 2015 22:42:21 +0000 (22:42 +0000)]
Merge "Fix GC map generation edge case"
Mathieu Chartier [Fri, 19 Jun 2015 22:41:34 +0000 (22:41 +0000)]
am
e11244a1: am
f0ed1f0f: Merge "Fix GC map generation edge case" into mnc-dev
* commit '
e11244a139b6589be20e4b46ece9c3dbcf1729ba':
Fix GC map generation edge case
Mathieu Chartier [Fri, 19 Jun 2015 22:28:21 +0000 (22:28 +0000)]
am
f0ed1f0f: Merge "Fix GC map generation edge case" into mnc-dev
* commit '
f0ed1f0fe2643c49997ea0e0bd04226ef7ba33fa':
Fix GC map generation edge case
Mathieu Chartier [Fri, 19 Jun 2015 20:55:27 +0000 (13:55 -0700)]
Fix GC map generation edge case
Previously we checked the number of bits, but then rounded up to a
byte boundary. If ref_bitmap_bits was 65535, it would pass the check
but not actually fit in the 13 bits for ref_bitmap_bytes since we
rounded up to 8192 bytes.
(cherry picked from commit
1626b919005df42ccc90ebe68fc57b7c56d44029)
Regression test infeasible due to smali limitations.
Bug:
21888453
Change-Id: If4b769431f27ecca14fe7852d017bcde01b3e146
Mathieu Chartier [Fri, 19 Jun 2015 22:19:22 +0000 (22:19 +0000)]
Merge "Fix GC map generation edge case" into mnc-dev
Nicolas Geoffray [Fri, 19 Jun 2015 21:23:17 +0000 (21:23 +0000)]
am
9e3351df: am
31fa4b57: Remove bogus DCHECK in BCE.
* commit '
9e3351dfc877136a257722d3a23e56d687517e66':
Remove bogus DCHECK in BCE.
Mathieu Chartier [Fri, 19 Jun 2015 20:55:27 +0000 (13:55 -0700)]
Fix GC map generation edge case
Previously we checked the number of bits, but then rounded up to a
byte boundary. If ref_bitmap_bits was 65535, it would pass the check
but not actually fit in the 13 bits for ref_bitmap_bytes since we
rounded up to 8192 bytes.
Regression test infeasible due to smali limitations.
Bug:
21888453
Change-Id: If4b769431f27ecca14fe7852d017bcde01b3e146
Mingyao Yang [Fri, 19 Jun 2015 21:07:37 +0000 (14:07 -0700)]
resolved conflicts for merge of
f4e67434 to mnc-dev-plus-aosp
Change-Id: I2823f5bc5b4fc6989577c1ac6c55e9a71d47dd49
Nicolas Geoffray [Fri, 19 Jun 2015 20:45:37 +0000 (20:45 +0000)]
am
31fa4b57: Remove bogus DCHECK in BCE.
* commit '
31fa4b57132a2352630b599b4da7e69f77376dcb':
Remove bogus DCHECK in BCE.
Nicolas Geoffray [Wed, 17 Jun 2015 09:17:49 +0000 (10:17 +0100)]
Remove bogus DCHECK in BCE.
When creating a phi for the array length when we add HDeoptimization
nodes, we might update accesses in inner loops to use that phi instead
of the array length. The BCE phase was not expecting this case.
Bug:
21034044
(cherry picked from commit
3cde6227678cf62e06bca264671d1e957456ac3d)
Change-Id: I639f4ea6f5889726142041a42736183f162c7437
David Srbecky [Fri, 19 Jun 2015 20:16:07 +0000 (21:16 +0100)]
Merge commit '
99001897' into mnc-dev-plus-aosp
Mingyao Yang [Fri, 19 Jun 2015 19:55:14 +0000 (19:55 +0000)]
am
bca381a1: Fix premature deoptimization if the loop body isn\'t entered.
* commit '
bca381a12965a98e3727e93986dd0a195db500a0':
Fix premature deoptimization if the loop body isn't entered.
Mingyao Yang [Tue, 19 May 2015 23:01:59 +0000 (16:01 -0700)]
Fix premature deoptimization if the loop body isn't entered.
Add a test between initial_ and end_ to see if the loop body is entered.
If the loop body isn't entered at all, we jump to the loop header. Loop header is
still executed and is going to test the condition again and loop body won't be
entered. This makes sure no deoptimization is triggered if the loop body isn't
even entered.
Bug:
21034044
(cherry picked from commit
3584bce5b1f45e5741d3a6ca24884a36320ecb6b)
Change-Id: I2b6de1f22fbc4568ca419f76382ebd87806d9694
Jeff Hao [Fri, 19 Jun 2015 18:42:16 +0000 (18:42 +0000)]
am
bd64add2: am
d5ff8c58: Merge "Fix case where block has no predecessor for StringChange."
* commit '
bd64add22771a0deb739a9ad56dc381557bf6a14':
Fix case where block has no predecessor for StringChange.
David Srbecky [Fri, 19 Jun 2015 18:35:53 +0000 (18:35 +0000)]
am
db538d30: Merge "ART stack unwinding fixes for libunwind/gdb/lldb." into mnc-dev
* commit '
db538d309bc34e025e921a04f10b4ee745bd9f1d':
ART stack unwinding fixes for libunwind/gdb/lldb.
Jeff Hao [Fri, 19 Jun 2015 18:31:00 +0000 (18:31 +0000)]
am
d5ff8c58: Merge "Fix case where block has no predecessor for StringChange."
* commit '
d5ff8c584b230da350f4ebfffec1d245c09bf26b':
Fix case where block has no predecessor for StringChange.
Jeff Hao [Fri, 19 Jun 2015 18:30:58 +0000 (18:30 +0000)]
am
f76b0ff7: am
3e91a44b: Fix case where block has no predecessor for StringChange.
* commit '
f76b0ff70491d71670a4295eac861d0ae49f5ec5':
Fix case where block has no predecessor for StringChange.
David Srbecky [Fri, 19 Jun 2015 18:25:56 +0000 (18:25 +0000)]
Merge "ART stack unwinding fixes for libunwind/gdb/lldb." into mnc-dev