OSDN Git Service
Jeff Hao [Mon, 22 Jun 2015 22:09:16 +0000 (22:09 +0000)]
am
44ca0d5b: am
38fafa18: Make large string use large object space.
* commit '
44ca0d5b7caa36cc3491c876e5b705929c60e732':
Make large string use large object space.
Jeff Hao [Mon, 22 Jun 2015 21:49:27 +0000 (21:49 +0000)]
am
38fafa18: Make large string use large object space.
* commit '
38fafa18f0fcf610f6314a0fc4165e04e6e5d017':
Make large string use large object space.
Igor Murashkin [Mon, 22 Jun 2015 21:49:26 +0000 (21:49 +0000)]
am
a8544f03: am
ec3a4e7c: Merge "runtime: Partially implement box-lambda and unbox-lambda experimental opcodes"
* commit '
a8544f03141e10bea601081bac3cb0a0c06e3a9b':
runtime: Partially implement box-lambda and unbox-lambda experimental opcodes
Andreas Gampe [Mon, 22 Jun 2015 21:49:25 +0000 (21:49 +0000)]
am
92b1a053: am
11dc78c8: Merge "ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes"
* commit '
92b1a05394611346aa6c1eff327b51eecb96deac':
ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes
Jeff Hao [Mon, 22 Jun 2015 21:29:54 +0000 (14:29 -0700)]
Make large string use large object space.
Bug:
21209641
Change-Id: I731a920c02f29f0321f2077093516aaa0f8d782f
Igor Murashkin [Mon, 22 Jun 2015 21:25:27 +0000 (21:25 +0000)]
am
ec3a4e7c: Merge "runtime: Partially implement box-lambda and unbox-lambda experimental opcodes"
* commit '
ec3a4e7cdc4f268b40d923227c125429f4ee4884':
runtime: Partially implement box-lambda and unbox-lambda experimental opcodes
Andreas Gampe [Mon, 22 Jun 2015 21:25:25 +0000 (21:25 +0000)]
am
11dc78c8: Merge "ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes"
* commit '
11dc78c8d36b4a65f4d955bc4303cc8279f1151e':
ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes
Igor Murashkin [Mon, 22 Jun 2015 21:15:01 +0000 (21:15 +0000)]
Merge "runtime: Partially implement box-lambda and unbox-lambda experimental opcodes"
Andreas Gampe [Mon, 22 Jun 2015 21:14:43 +0000 (21:14 +0000)]
Merge "ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes"
Igor Murashkin [Thu, 18 Jun 2015 17:05:11 +0000 (10:05 -0700)]
runtime: Partially implement box-lambda and unbox-lambda experimental opcodes
These opcodes are not yet fully specified, and *will* change before they become shippable.
Do not write production code against experimental opcodes.
--
Implement partial interpreter support for new dex instructions box/unbox-lambda.
* box-lambda will take a closure and convert it into an Object
* unbox-lambda will take an Object and convert it to a closure
(Currently does not implement object identity or variable capture).
All new opcodes are disabled by default, use runtime option -Xexperimental-lambdas to enable them.
Change-Id: I3c15ccf8a26ccecd1d35808a8c1b4149220f6019
Hiroshi Yamauchi [Mon, 22 Jun 2015 20:02:43 +0000 (20:02 +0000)]
am
f3d8943c: am
f7012291: Merge "Run an empty checkpoint before marking ends in the CC collector."
* commit '
f3d8943cde9d67f202ba59d3de9e7d8b93b406d1':
Run an empty checkpoint before marking ends in the CC collector.
Hiroshi Yamauchi [Mon, 22 Jun 2015 19:50:41 +0000 (19:50 +0000)]
am
f7012291: Merge "Run an empty checkpoint before marking ends in the CC collector."
* commit '
f7012291ed9c984e2b50d83d7a2d5758cd64c99a':
Run an empty checkpoint before marking ends in the CC collector.
Hiroshi Yamauchi [Mon, 22 Jun 2015 19:40:00 +0000 (19:40 +0000)]
Merge "Run an empty checkpoint before marking ends in the CC collector."
Andreas Gampe [Mon, 22 Jun 2015 18:35:46 +0000 (11:35 -0700)]
ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes
We must check that all fields are non-final, even for unresolved
classes. Fall back to the dex file for this information.
Bug:
22005084
Bug: https://code.google.com/p/android/issues/detail?id=177694
Change-Id: If2126d1be5dccadbbedcdccabde7398688d6e5ca
Andreas Gampe [Mon, 22 Jun 2015 17:42:51 +0000 (17:42 +0000)]
am
29a7fdfc: am
ae393c3b: Merge "ART: Avoid recursive abort in barrier"
* commit '
29a7fdfc76f0ac37e3151adcbe5bb9a398abc3b7':
ART: Avoid recursive abort in barrier
Andreas Gampe [Mon, 22 Jun 2015 17:28:15 +0000 (17:28 +0000)]
am
ae393c3b: Merge "ART: Avoid recursive abort in barrier"
* commit '
ae393c3b24cfdad97aaded8c0ff1ee7262b46ffe':
ART: Avoid recursive abort in barrier
Andreas Gampe [Mon, 22 Jun 2015 17:18:57 +0000 (17:18 +0000)]
Merge "ART: Avoid recursive abort in barrier"
Calin Juravle [Mon, 22 Jun 2015 17:15:48 +0000 (17:15 +0000)]
am
b1ae1731: am
59cb5218: Merge "Fix in ReferenceTypePropagation"
* commit '
b1ae173172e6c55c2faa49bddb07b07a825850af':
Fix in ReferenceTypePropagation
Calin Juravle [Mon, 22 Jun 2015 17:06:52 +0000 (17:06 +0000)]
am
59cb5218: Merge "Fix in ReferenceTypePropagation"
* commit '
59cb52189d350fa9fb38b767fa9b25d971375833':
Fix in ReferenceTypePropagation
Andreas Gampe [Mon, 22 Jun 2015 17:04:39 +0000 (10:04 -0700)]
ART: Avoid recursive abort in barrier
Try to avoid recursive abort in barrier. May lead to a segfault
instead of a nested abort in bad cases.
Change-Id: I0e7976b77c243956dbcf81142bd5df81d5927ce0
Calin Juravle [Mon, 22 Jun 2015 16:57:04 +0000 (16:57 +0000)]
Merge "Fix in ReferenceTypePropagation"
Vladimir Marko [Mon, 22 Jun 2015 16:23:09 +0000 (16:23 +0000)]
am
ce293cd6: am
421e495c: ART: Don\'t do pre-linked calls to the interpreter bridge.
* commit '
ce293cd6ebbdb759beae28541beb757eaef64e73':
ART: Don't do pre-linked calls to the interpreter bridge.
Vladimir Marko [Mon, 22 Jun 2015 16:23:03 +0000 (16:23 +0000)]
am
bf5a1708: am
c30e721b: Merge "ART: Don\'t do pre-linked calls to the interpreter bridge."
* commit '
bf5a1708f370ee528e2b04822d068a3fffdc7932':
ART: Don't do pre-linked calls to the interpreter bridge.
Vladimir Marko [Mon, 22 Jun 2015 16:11:35 +0000 (16:11 +0000)]
am
421e495c: ART: Don\'t do pre-linked calls to the interpreter bridge.
* commit '
421e495c9bc53649605639dd738b8da8669147f1':
ART: Don't do pre-linked calls to the interpreter bridge.
Vladimir Marko [Mon, 22 Jun 2015 16:10:45 +0000 (16:10 +0000)]
am
c30e721b: Merge "ART: Don\'t do pre-linked calls to the interpreter bridge."
* commit '
c30e721b5ddcb4ba6835c5b721e1c5095f4a3d7f':
ART: Don't do pre-linked calls to the interpreter bridge.
Andreas Gampe [Mon, 22 Jun 2015 15:59:39 +0000 (15:59 +0000)]
am
a83938ea: am
a6efe5e8: ART: Disallow classes that are abstract and final
* commit '
a83938eaa7646eb89679bd4a542b6cdcb24ab132':
ART: Disallow classes that are abstract and final
Vladimir Marko [Mon, 22 Jun 2015 15:57:16 +0000 (15:57 +0000)]
Merge "ART: Don't do pre-linked calls to the interpreter bridge."
Vladimir Marko [Mon, 22 Jun 2015 13:35:42 +0000 (14:35 +0100)]
ART: Don't do pre-linked calls to the interpreter bridge.
Bug:
21897404
(cherry picked from commit
c08ab29796eeaa3b5863fbd987cd96fe7538d40c)
Change-Id: I66531379fb4468a8ddee063e664bf6593abbe7d5
Nicolas Geoffray [Mon, 22 Jun 2015 15:50:48 +0000 (16:50 +0100)]
resolved conflicts for merge of
564a2671 to mnc-dev-plus-aosp
Change-Id: Ibe355257df7556fe3bc2af425807a43f75dff528
Andreas Gampe [Mon, 22 Jun 2015 15:45:12 +0000 (15:45 +0000)]
am
a6efe5e8: ART: Disallow classes that are abstract and final
* commit '
a6efe5e813457a1c7946a1e6c62646b7bd1150df':
ART: Disallow classes that are abstract and final
Nicolas Geoffray [Mon, 22 Jun 2015 15:41:58 +0000 (15:41 +0000)]
am
8166f79b: (-s ours) am
ee393607: (-s ours) Revert "Add support for inlining already sharpened interface calls. DO NOT MERGE ANYWHERE"
* commit '
8166f79be78104ef742ac6d31cc2c439e082f717':
Revert "Add support for inlining already sharpened interface calls. DO NOT MERGE ANYWHERE"
Nicolas Geoffray [Mon, 22 Jun 2015 15:41:56 +0000 (15:41 +0000)]
am
3cd356fd: am
042fd002: Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
* commit '
3cd356fdb11f50cf40ddfe1747b7a24f786cdacc':
Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Andreas Gampe [Mon, 22 Jun 2015 15:14:49 +0000 (15:14 +0000)]
am
2dda3918: am
f91fb4a6: Merge "ART: Disallow classes that are abstract and final"
* commit '
2dda3918305aeb8dfb0b00ae4d4363c3ab794853':
ART: Disallow classes that are abstract and final
Andreas Gampe [Mon, 22 Jun 2015 15:02:49 +0000 (15:02 +0000)]
am
f91fb4a6: Merge "ART: Disallow classes that are abstract and final"
* commit '
f91fb4a6a565809dd077ee128d11f30b67e6f2ff':
ART: Disallow classes that are abstract and final
Andreas Gampe [Sat, 20 Jun 2015 05:58:47 +0000 (22:58 -0700)]
ART: Disallow classes that are abstract and final
Make the verifier fail such classes.
Bug:
21873151
(cherry picked from commit
507cc6f83bf6379728f2dd20391f2ed5fbfe6371)
Change-Id: I217f3d71f44bccdcee7ca830e092c807928bed39
Andreas Gampe [Mon, 22 Jun 2015 14:50:42 +0000 (14:50 +0000)]
Merge "ART: Disallow classes that are abstract and final"
Vladimir Marko [Mon, 22 Jun 2015 13:35:42 +0000 (14:35 +0100)]
ART: Don't do pre-linked calls to the interpreter bridge.
Bug:
21897404
Change-Id: I6cca9d3b436df2eed2b0192607de0faf5cc2ecf7
Nicolas Geoffray [Mon, 22 Jun 2015 14:23:30 +0000 (14:23 +0000)]
am
88593111: Revert "Revert "Add support for inlining already sharpened interface calls.""
* commit '
88593111c3a0fec728c1ced01740a20f702b3ffd':
Revert "Revert "Add support for inlining already sharpened interface calls.""
Nicolas Geoffray [Mon, 22 Jun 2015 14:23:29 +0000 (14:23 +0000)]
am
ee393607: (-s ours) Revert "Add support for inlining already sharpened interface calls. DO NOT MERGE ANYWHERE"
* commit '
ee39360775066e6b9920348c86ea98bf01d0facf':
Revert "Add support for inlining already sharpened interface calls. DO NOT MERGE ANYWHERE"
Nicolas Geoffray [Mon, 22 Jun 2015 14:23:28 +0000 (14:23 +0000)]
am
042fd002: Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
* commit '
042fd00295d21f936ba7a8c16915ce678970e658':
Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Nicolas Geoffray [Mon, 22 Jun 2015 14:15:07 +0000 (14:15 +0000)]
Revert "Revert "Add support for inlining already sharpened interface calls.""
bug:
21867144
This reverts commit
ee39360775066e6b9920348c86ea98bf01d0facf.
Change-Id: I69bf85ce7c352b1a22f36f0f2a136f95b4e73bd6
Nicolas Geoffray [Mon, 22 Jun 2015 14:11:58 +0000 (15:11 +0100)]
Revert "Add support for inlining already sharpened interface calls. DO NOT MERGE ANYWHERE"
This reverts commit
c362782609ca6fbc355ccc9ea9110fe671db9671.
Reverting in order to make a commit that will merge.
bug:
21867144
Nicolas Geoffray [Mon, 22 Jun 2015 14:09:31 +0000 (14:09 +0000)]
Merge "resolved conflicts for merge of
bced2b1c to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
Nicolas Geoffray [Mon, 22 Jun 2015 10:06:43 +0000 (11:06 +0100)]
Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Don't use IsAssignableFrom, but check beforehand if the referrer is an
interface. Otherwise, we are being too aggressive on removing clinit
checks on interfaces (being a subclass doesn't imply the interface
has been initialized).
bug:
21870666
This reverts commit
463580ca5a1e75e27ad0207537ffc6252091326a.
(cherry picked from commit
b783b408112d1797da646f576a40f94bcb5162f3)
Change-Id: Ida03f453c9b0d4dda87a5696098f9ffbd69a3aa3
Nicolas Geoffray [Mon, 22 Jun 2015 14:06:52 +0000 (15:06 +0100)]
resolved conflicts for merge of
bced2b1c to mnc-dev-plus-aosp
Change-Id: Iafc93afb99218df8d3abf867ca27374a75697e23
Nicolas Geoffray [Mon, 22 Jun 2015 14:01:35 +0000 (14:01 +0000)]
am
28a33395: am
2d655f1c: Merge "Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness."""
* commit '
28a33395201d4d5a0d04de664023793d514679c3':
Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Nicolas Geoffray [Mon, 22 Jun 2015 13:53:58 +0000 (13:53 +0000)]
am
2d655f1c: Merge "Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness."""
* commit '
2d655f1ce89a714094a4f55ac75edcf9a34c7e24':
Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Nicolas Geoffray [Mon, 22 Jun 2015 13:47:02 +0000 (13:47 +0000)]
Merge "Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness."""
Nicolas Geoffray [Mon, 22 Jun 2015 13:42:42 +0000 (14:42 +0100)]
resolved conflicts for merge of
a7b3540b to mnc-dev-plus-aosp
Change-Id: I3950ece84ef637f37f89b9fdb7feb983bf961d5c
Nicolas Geoffray [Mon, 22 Jun 2015 10:06:43 +0000 (11:06 +0100)]
Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Don't use IsAssignableFrom, but check beforehand if the referrer is an
interface. Otherwise, we are being too aggressive on removing clinit
checks on interfaces (being a subclass doesn't imply the interface
has been initialized).
bug:
21870666
This reverts commit
463580ca5a1e75e27ad0207537ffc6252091326a.
Change-Id: I2a13974d28477ee3e5224142cc260cbf46d19aa9
Nicolas Geoffray [Mon, 22 Jun 2015 13:36:34 +0000 (13:36 +0000)]
am
c48c7e6a: Use compiling class instead of outer class for access checks.
* commit '
c48c7e6a540a0e23ff26ce12e2fe94adefd8ed48':
Use compiling class instead of outer class for access checks.
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
(cherry picked from commit
afd06414598e011693137ba044e38756609b2179)
Change-Id: I982ccdf46e3f4d0cc1901439e0bc2dcfa0fc661f
Nicolas Geoffray [Mon, 22 Jun 2015 13:23:01 +0000 (13:23 +0000)]
am
7d593094: Use compiling class instead of referrer for access checks.
* commit '
7d59309458c69e1b2b2e85be5acc150979198f6f':
Use compiling class instead of referrer for access checks.
Nicolas Geoffray [Mon, 22 Jun 2015 13:14:29 +0000 (14:14 +0100)]
resolved conflicts for merge of
6425b37b to mnc-dev-plus-aosp
Change-Id: I5bc20d3bf1db1e190ff9d21abc81bdf5dbeffa9f
Nicolas Geoffray [Fri, 19 Jun 2015 12:32:41 +0000 (13:32 +0100)]
Use compiling class instead of referrer for access checks.
bug:
21869670
(cherry picked from commit
30451743493bc2f589e96d68ab98f557461f97f9)
Change-Id: Ia18986797d166470801e7a9a690c054d2dc57952
Nicolas Geoffray [Mon, 22 Jun 2015 13:11:28 +0000 (13:11 +0000)]
am
15e0965d: am
bbcec62c: Merge "Don\'t check the return type in the builder." into mnc-dev
* commit '
15e0965d3bd6f0ceca6334c7b3e6ae5dd14f3a2a':
Don't check the return type in the builder.
Nicolas Geoffray [Mon, 22 Jun 2015 13:11:22 +0000 (13:11 +0000)]
am
c7cf0ee0: am
39eb41f6: Merge "Do not expect 0 or 1 only when comparing a boolean." into mnc-dev
* commit '
c7cf0ee0b8275f60c06193e0d77c51bfb6929a1c':
Do not expect 0 or 1 only when comparing a boolean.
Nicolas Geoffray [Mon, 22 Jun 2015 13:11:21 +0000 (13:11 +0000)]
am
1e3055a2: am
39d40afb: Verifier: check an aput, even if we know it will fail.
* commit '
1e3055a298ccf709fc34ffde1ffccead197560b6':
Verifier: check an aput, even if we know it will fail.
Nicolas Geoffray [Mon, 22 Jun 2015 13:09:09 +0000 (13:09 +0000)]
Merge "resolved conflicts for merge of
18218b8b to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
Nicolas Geoffray [Mon, 22 Jun 2015 13:04:33 +0000 (14:04 +0100)]
resolved conflicts for merge of
18218b8b to mnc-dev-plus-aosp
Change-Id: I30ae4f273eda2d4ecf2fbc0147012a9fa750c9d5
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.
Nicolas Geoffray [Mon, 22 Jun 2015 11:47:28 +0000 (11:47 +0000)]
am
1e256bf2: Be careful with predecessor/successor index.
* commit '
1e256bf257e8d97df9b2178ae8658b731ca2d662':
Be careful with predecessor/successor index.
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 [Fri, 19 Jun 2015 15:17:05 +0000 (16:17 +0100)]
Be careful with predecessor/successor index.
When we simplify the CFG, we must preserve things that were already
simplified. For example, the index in the predecessor list or
successor list of a block must be preserved for ensuring the
first block is a loop pre header.
bug:
21867463
(cherry picked from commit
8b20f88b0a8d1b374dd5eaae289d19734c77b8f8)
Change-Id: I2581b5a50942290da96cd9ec876f6f2573e0a6c4
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:32 +0000 (11:35 +0000)]
am
bbcec62c: Merge "Don\'t check the return type in the builder." into mnc-dev
* commit '
bbcec62c0484fbfb82ee2c317e8afa478a63027b':
Don't check the return type in the builder.
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:25:02 +0000 (11:25 +0000)]
Merge "Don't check the return type in the builder." into mnc-dev
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 [Thu, 18 Jun 2015 17:04:12 +0000 (18:04 +0100)]
Don't check the return type in the builder.
The verifier will not complain about dead code. For the compiler,
it is benign.
bug:
21863767
(cherry picked from commit
69505f86a1a653bf86c1f2b423b3e0605137d5d1)
Change-Id: I2bc7888b39c91862c6dade130eccdf92f19b3f6f
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:10:14 +0000 (11:10 +0000)]
am
39eb41f6: Merge "Do not expect 0 or 1 only when comparing a boolean." into mnc-dev
* commit '
39eb41f6ad5af18fb9225e5898f20e348e1a7d75':
Do not expect 0 or 1 only when comparing a boolean.
Nicolas Geoffray [Mon, 22 Jun 2015 11:10:13 +0000 (11:10 +0000)]
am
39d40afb: Verifier: check an aput, even if we know it will fail.
* commit '
39d40afb789c9ae80b1105168241dcdc92491b5d':
Verifier: check an aput, even if we know it will fail.
Nicolas Geoffray [Mon, 22 Jun 2015 11:09:24 +0000 (11:09 +0000)]
Merge "Use compiling class instead of outer class for access checks."
Nicolas Geoffray [Mon, 22 Jun 2015 11:07:17 +0000 (11:07 +0000)]
Merge "Do not expect 0 or 1 only when comparing a boolean." into mnc-dev
Nicolas Geoffray [Fri, 19 Jun 2015 10:42:07 +0000 (11:42 +0100)]
Do not expect 0 or 1 only when comparing a boolean.
bug:
21866529
(cherry picked from commit
3c4ab80c102ff1bfc0e74d4abddbf5454bf4008d)
Change-Id: Ibdc0d4a9730bfc6e7307282276f084dae5ac55c1
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
Nicolas Geoffray [Mon, 22 Jun 2015 10:52:28 +0000 (10:52 +0000)]
am
a04e7b7c: Run a simplification pass before code generation.
* commit '
a04e7b7ceae01a7ceda41419e4c639a43e18361e':
Run a simplification pass before code generation.
Nicolas Geoffray [Fri, 19 Jun 2015 09:35:42 +0000 (10:35 +0100)]
Verifier: check an aput, even if we know it will fail.
bug:
21867457
(cherry picked from commit
66389fbeb41c981648bb2e1e7e2f43089f095591)
Change-Id: Id01edeb871f6bc59518eb341e5b76f021cfdfe06
Nicolas Geoffray [Thu, 18 Jun 2015 14:46:47 +0000 (15:46 +0100)]
Run a simplification pass before code generation.
The code generators assume things that only the instruction
simplier ensures. So it has to be run last in case previous
optimiziations broke those assumptions.
bug:
21865464
(cherry picked from commit
b2bdfce7f805b00668a2521b1c939a0aafb2be49)
Change-Id: Ibf4384a911e400eb7586bbf6b4edd6351034cbd8
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.