OSDN Git Service
Roland Levillain [Fri, 3 Jul 2015 16:27:30 +0000 (16:27 +0000)]
am
4a305daf: Merge "Add implicit null pointer and stack overflow checks for Mips."
* commit '
4a305daf77a9b80d6abb7817a836aa59d2db521d':
Add implicit null pointer and stack overflow checks for Mips.
Roland Levillain [Fri, 3 Jul 2015 16:18:00 +0000 (16:18 +0000)]
Merge "Add implicit null pointer and stack overflow checks for Mips."
Douglas Leung [Thu, 2 Jul 2015 23:42:08 +0000 (16:42 -0700)]
Add implicit null pointer and stack overflow checks for Mips.
Bug:
21555893
Change-Id: I2a995be128a5603d08753c14956dd8c8240ac63c
Calin Juravle [Thu, 2 Jul 2015 17:33:01 +0000 (17:33 +0000)]
am
b447598f: Merge "Disable static builds for mac and asan."
* commit '
b447598f6900f05f0b1940a0731ee374c57c3100':
Disable static builds for mac and asan.
Calin Juravle [Thu, 2 Jul 2015 17:23:56 +0000 (17:23 +0000)]
Merge "Disable static builds for mac and asan."
Calin Juravle [Thu, 2 Jul 2015 17:21:14 +0000 (18:21 +0100)]
Disable static builds for mac and asan.
- asan doesn't support static linkage
- we don't need a static build of dex2oat for mac
Change-Id: I7eddd19f1f47e8b2a67ecc0aaf40cb70941febdd
Nicolas Geoffray [Thu, 2 Jul 2015 17:08:41 +0000 (17:08 +0000)]
am
aefdcd9a: Merge "Do not create a HBoundType when the instruction is non-null."
* commit '
aefdcd9a06bc436a0f0908230856d1054018cd93':
Do not create a HBoundType when the instruction is non-null.
Nicolas Geoffray [Thu, 2 Jul 2015 17:01:02 +0000 (17:01 +0000)]
Merge "Do not create a HBoundType when the instruction is non-null."
Nicolas Geoffray [Thu, 2 Jul 2015 14:48:27 +0000 (15:48 +0100)]
Do not create a HBoundType when the instruction is non-null.
We don't need to refine the type after a null check, if the
instruction is known non null or null. As a side effect, this
avoids replacing HLoadClass instructions with HBoundType instructions.
bug:
22116987
(cherry picked from commit
3abd437507f8ba30a238a52c273c9944dcb9d5a1)
Change-Id: I5e56de293554534195ade9770b7d1e4b078d685b
Calin Juravle [Thu, 2 Jul 2015 13:04:13 +0000 (13:04 +0000)]
am
06b6da5c: Merge "Fix mac build: use -lrt only on linux."
* commit '
06b6da5ccbf9246c697b8cf1be0ba58ce616521d':
Fix mac build: use -lrt only on linux.
Calin Juravle [Thu, 2 Jul 2015 12:52:48 +0000 (12:52 +0000)]
Merge "Fix mac build: use -lrt only on linux."
Calin Juravle [Thu, 2 Jul 2015 12:48:37 +0000 (13:48 +0100)]
Fix mac build: use -lrt only on linux.
Change-Id: I25e6058d9003fa52ef3c8bd153c2108712ce7f96
Calin Juravle [Thu, 2 Jul 2015 11:09:04 +0000 (11:09 +0000)]
am
a3529ea5: Merge "Enable ART_BUILD_HOST_STATIC for check builds."
* commit '
a3529ea5ec5c494647d72e219263d4ca374ca2ff':
Enable ART_BUILD_HOST_STATIC for check builds.
Calin Juravle [Thu, 2 Jul 2015 11:02:38 +0000 (11:02 +0000)]
Merge "Enable ART_BUILD_HOST_STATIC for check builds."
Calin Juravle [Thu, 2 Jul 2015 10:51:22 +0000 (11:51 +0100)]
Enable ART_BUILD_HOST_STATIC for check builds.
Change-Id: Id888c3b0c544ea6a85799f2264b13f1d035fc754
Calin Juravle [Thu, 2 Jul 2015 10:39:25 +0000 (10:39 +0000)]
am
23bfc0bd: Merge "Build statically linked version of dex2oat."
* commit '
23bfc0bd4b9af12c6b3a574719917f92e4b8c261':
Build statically linked version of dex2oat.
Calin Juravle [Thu, 2 Jul 2015 10:39:24 +0000 (10:39 +0000)]
am
7a20ae64: Merge "Allow for sig chain to be disabled."
* commit '
7a20ae64a6d994eec8cb04602325aed91713cb72':
Allow for sig chain to be disabled.
Calin Juravle [Thu, 2 Jul 2015 10:30:06 +0000 (10:30 +0000)]
Merge "Build statically linked version of dex2oat."
Calin Juravle [Thu, 2 Jul 2015 10:29:48 +0000 (10:29 +0000)]
Merge "Allow for sig chain to be disabled."
Roland Levillain [Thu, 2 Jul 2015 09:37:21 +0000 (09:37 +0000)]
am
c87c8939: Merge "Implement heap poisoning in ART\'s Optimizing compiler."
* commit '
c87c8939ea1bcfbddb954478d527cf1138f4f343':
Implement heap poisoning in ART's Optimizing compiler.
Roland Levillain [Thu, 2 Jul 2015 08:44:21 +0000 (08:44 +0000)]
Merge "Implement heap poisoning in ART's Optimizing compiler."
Andreas Gampe [Thu, 2 Jul 2015 00:27:40 +0000 (00:27 +0000)]
am
01b2129d: Merge "Added index type of dex byte instructions."
* commit '
01b2129de3e182b79aa820e71fc7fa1ef42f2d35':
Added index type of dex byte instructions.
Andreas Gampe [Wed, 1 Jul 2015 20:27:06 +0000 (20:27 +0000)]
Merge "Added index type of dex byte instructions."
Roland Levillain [Wed, 1 Jul 2015 14:41:14 +0000 (15:41 +0100)]
Implement heap poisoning in ART's Optimizing compiler.
- Instrument ARM, ARM64, x86 and x86-64 code generators.
- Note: To turn heap poisoning on in Optimizing, set the
environment variable `ART_HEAP_POISONING' to "true"
before compiling ART.
Bug:
12687968
Change-Id: Ib3120b38cf805a8a50207a314b9ccc90c8d93740
Nicolas Geoffray [Wed, 1 Jul 2015 15:27:18 +0000 (15:27 +0000)]
am
ea725ec1: Merge "Don\'t print signatures to avoid spaces."
* commit '
ea725ec1b5b9a594842dde02b247f4707ee0c93a':
Don't print signatures to avoid spaces.
David Brazdil [Wed, 1 Jul 2015 15:27:17 +0000 (15:27 +0000)]
am
8941d5e0: Merge "Address additional comments on try-catch CL"
* commit '
8941d5e0755e8cd3f1e35e3efcbe8eeaf3b616fa':
Address additional comments on try-catch CL
Nicolas Geoffray [Wed, 1 Jul 2015 15:20:35 +0000 (15:20 +0000)]
Merge "Don't print signatures to avoid spaces."
David Brazdil [Wed, 1 Jul 2015 15:16:14 +0000 (15:16 +0000)]
Merge "Address additional comments on try-catch CL"
Nicolas Geoffray [Wed, 1 Jul 2015 15:10:44 +0000 (16:10 +0100)]
Don't print signatures to avoid spaces.
Change-Id: I64340fbd08282acb0eb4142d17d37e69bba507cf
David Brazdil [Wed, 1 Jul 2015 14:28:26 +0000 (15:28 +0100)]
Address additional comments on try-catch CL
Extra documentation of try-catch building.
Change-Id: I5048c5fcb354c76fa4a60c3d8d21dd216bc9f6cd
David Brazdil [Wed, 1 Jul 2015 14:02:52 +0000 (14:02 +0000)]
am
8922e0b5: Merge "ART: Changes to try-catch in GraphBuilder"
* commit '
8922e0b575742aaabbb4168b8703f7c1a4cb346c':
ART: Changes to try-catch in GraphBuilder
David Brazdil [Wed, 1 Jul 2015 13:54:32 +0000 (13:54 +0000)]
Merge "ART: Changes to try-catch in GraphBuilder"
David Brazdil [Tue, 30 Jun 2015 14:41:36 +0000 (15:41 +0100)]
ART: Changes to try-catch in GraphBuilder
This patch adds an additional case into the insertion algorithm for
HTryBoundary inside HGraphBuilder in order to better handle catch
blocks covered by a TryItem.
Building SSA form also required to stop combining HTryBoundaries for
neighbouring TryItems because it was not clear which exception
handlers belong to which try block.
Change-Id: Ic68bd6ef98fee784609fa593cb08dca1f00a15e0
Nicolas Geoffray [Wed, 1 Jul 2015 13:14:40 +0000 (13:14 +0000)]
am
312f1bfc: Merge "Do not do a type check when setting null to an array."
* commit '
312f1bfcfd8f655e635c941dda147377d8bff814':
Do not do a type check when setting null to an array.
Nicolas Geoffray [Wed, 1 Jul 2015 13:01:51 +0000 (13:01 +0000)]
am
39dc3759: Merge "Emit method name at invokes in the graph visualizer."
* commit '
39dc3759fa9a32da145e8823430d16a6a5acaba6':
Emit method name at invokes in the graph visualizer.
Nicolas Geoffray [Wed, 1 Jul 2015 13:00:46 +0000 (13:00 +0000)]
Merge "Do not do a type check when setting null to an array."
Nicolas Geoffray [Wed, 1 Jul 2015 11:56:46 +0000 (12:56 +0100)]
Do not do a type check when setting null to an array.
Change-Id: I7387d45aea697d4a3de273335647220a815a992b
Nicolas Geoffray [Wed, 1 Jul 2015 12:50:28 +0000 (12:50 +0000)]
Merge "Emit method name at invokes in the graph visualizer."
Calin Juravle [Mon, 8 Jun 2015 09:35:24 +0000 (10:35 +0100)]
Build statically linked version of dex2oat.
Change-Id: Icde39b770781095af7bd87ae6b907ad97a8a05da
Sebastien Hertz [Wed, 1 Jul 2015 12:21:46 +0000 (12:21 +0000)]
am
8406b313: Merge "Properly delete temp files during run-test"
* commit '
8406b3131e186ce75644f589b3b53eca375cd611':
Properly delete temp files during run-test
Sebastien Hertz [Wed, 1 Jul 2015 12:14:44 +0000 (12:14 +0000)]
Merge "Properly delete temp files during run-test"
Roland Levillain [Wed, 1 Jul 2015 12:11:02 +0000 (12:11 +0000)]
am
436cbc5e: Merge "Fix a MOV instruction in Optimizing\'s x86-64 code generator."
* commit '
436cbc5e4c360962275713f3d2649ff7be88aaa4':
Fix a MOV instruction in Optimizing's x86-64 code generator.
Nicolas Geoffray [Wed, 1 Jul 2015 12:00:15 +0000 (13:00 +0100)]
Emit method name at invokes in the graph visualizer.
Change-Id: I832f823463569724fca9c38cd70d9dd552f15b3a
Roland Levillain [Wed, 1 Jul 2015 11:58:21 +0000 (11:58 +0000)]
Merge "Fix a MOV instruction in Optimizing's x86-64 code generator."
Nicolas Geoffray [Wed, 1 Jul 2015 11:56:44 +0000 (11:56 +0000)]
am
c7657e93: Merge "Use CompareAndBranchIf(Non)Zero when applicable."
* commit '
c7657e93b6b045eaff18190b8133361652bf8c1c':
Use CompareAndBranchIf(Non)Zero when applicable.
Roland Levillain [Wed, 1 Jul 2015 11:47:25 +0000 (12:47 +0100)]
Fix a MOV instruction in Optimizing's x86-64 code generator.
Use `movl' instead of `movw' to store a 32-bit immediate
(integer or reference) into a field.
Also fix art::Location::RegisterOrInt32LongConstant to
properly handle non-long constants.
Change-Id: I34c6ec8eaa1632822a31969f87c9c2d6c5b96326
Nicolas Geoffray [Wed, 1 Jul 2015 11:46:48 +0000 (11:46 +0000)]
Merge "Use CompareAndBranchIf(Non)Zero when applicable."
Nicolas Geoffray [Wed, 1 Jul 2015 11:22:56 +0000 (12:22 +0100)]
Use CompareAndBranchIf(Non)Zero when applicable.
Now that we relocate branches, we can try make more use of cbz/cbnz.
Change-Id: I93ca64107f34eb3c43f2e7102ea90453113dad7a
Calin Juravle [Fri, 19 Jun 2015 21:05:39 +0000 (22:05 +0100)]
Allow for sig chain to be disabled.
Tools like dex2oat or patchoat don't need the sig chain or the fault
manager. This also enables building a statically link version of
dex2oat.
Change-Id: I9897728cac48acade854bb027bfde860628ebf84
Andreas Gampe [Wed, 1 Jul 2015 05:30:34 +0000 (05:30 +0000)]
am
2b252dc1: Merge "Quick: Fix a DCHECK to take type conflicts into account."
* commit '
2b252dc15995a708aead33aab6d307205d860a88':
Quick: Fix a DCHECK to take type conflicts into account.
Andreas Gampe [Wed, 1 Jul 2015 05:18:32 +0000 (05:18 +0000)]
am
39602104: Merge "ART: Symbolize all oat files in /data folder."
* commit '
396021047892e5976051e9cb86ee38943a9102d3':
ART: Symbolize all oat files in /data folder.
Andreas Gampe [Wed, 1 Jul 2015 05:17:24 +0000 (05:17 +0000)]
Merge "Quick: Fix a DCHECK to take type conflicts into account."
Andreas Gampe [Wed, 1 Jul 2015 05:06:20 +0000 (05:06 +0000)]
Merge "ART: Symbolize all oat files in /data folder."
Zheng Xu [Tue, 21 Apr 2015 09:35:25 +0000 (17:35 +0800)]
ART: Symbolize all oat files in /data folder.
Now we store oat files not only in /data/dalvik-cache, but also in
other places. This patch tries to pull all oat files from device
/data folder.
Change-Id: Icf81cf28c29da2e248e4fbd84f5920f46ddc4cd6
Evgenii Stepanov [Tue, 30 Jun 2015 22:30:05 +0000 (22:30 +0000)]
am
371496da: Merge "Explicitly link libz-host to libart."
* commit '
371496daf03921c0c3ade8bc20b33b6454d8d495':
Explicitly link libz-host to libart.
Evgenii Stepanov [Tue, 30 Jun 2015 22:19:13 +0000 (22:19 +0000)]
Merge "Explicitly link libz-host to libart."
Andreas Gampe [Tue, 30 Jun 2015 21:30:00 +0000 (21:30 +0000)]
am
053df00e: Merge "ART: Remove bad FindSymbol call"
* commit '
053df00e1d27e658f016f4ff6d5a822861555e6a':
ART: Remove bad FindSymbol call
Andreas Gampe [Tue, 30 Jun 2015 21:10:50 +0000 (21:10 +0000)]
Merge "ART: Remove bad FindSymbol call"
Andreas Gampe [Tue, 30 Jun 2015 18:23:44 +0000 (11:23 -0700)]
ART: Remove bad FindSymbol call
The removed call is superfluous under normal operation and harmful
when running a native-bridged library.
Bug:
22194296
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2367
Change-Id: I3eb8f435a6a974a3e87a370b254ba8752f2a59b3
Andreas Gampe [Tue, 30 Jun 2015 17:50:39 +0000 (17:50 +0000)]
am
edf9daf3: Merge "ART: Unlink target oat file before compiling"
* commit '
edf9daf30d87ba37a91782d4904a452cce75fc90':
ART: Unlink target oat file before compiling
Andreas Gampe [Tue, 30 Jun 2015 17:50:38 +0000 (17:50 +0000)]
am
d3af3480: Merge "Change ART_TEST_GC_STRESS to use new gcstress mode"
* commit '
d3af34808d938bf4fb3ec95bfe0d4fa440ccdb95':
Change ART_TEST_GC_STRESS to use new gcstress mode
Andreas Gampe [Tue, 30 Jun 2015 17:50:37 +0000 (17:50 +0000)]
am
915e9e0e: Merge "ART: Fix test 036-finalizer"
* commit '
915e9e0e4fa23e55962f5e7814041f7bc2b1f331':
ART: Fix test 036-finalizer
Andreas Gampe [Tue, 30 Jun 2015 17:44:01 +0000 (17:44 +0000)]
Merge "ART: Unlink target oat file before compiling"
Andreas Gampe [Tue, 30 Jun 2015 17:42:23 +0000 (17:42 +0000)]
Merge "Change ART_TEST_GC_STRESS to use new gcstress mode"
Mathieu Chartier [Sat, 27 Jun 2015 22:42:27 +0000 (15:42 -0700)]
Change ART_TEST_GC_STRESS to use new gcstress mode
Enable new gcstress mode that checks at each allocation site
(with some tracking of stack traces to only do one check per
unique site).
Disable 137-cfi for gcstress, as it's sleeping to "synchronize"
with a forked process, which doesn't work with the slower mode.
Bug:
22014525
Change-Id: Ife70308e45b04f5d97267b4d98f8c75fa96492a1
Andreas Gampe [Tue, 30 Jun 2015 17:37:26 +0000 (17:37 +0000)]
Merge "ART: Fix test 036-finalizer"
Mathieu Chartier [Sat, 27 Jun 2015 22:42:27 +0000 (15:42 -0700)]
ART: Fix test 036-finalizer
Need to fix bug in test 036 where some allocation sites could cause
GC to run which caused the test to fail due to a weak reference
getting cleared. This change is required for the new GCSTRESS mode.
Bug:
22014525
Change-Id: I8099d2f03bc2f14f4ca6d49133f0d17d8aa49a7b
Andreas Gampe [Sat, 27 Jun 2015 01:58:42 +0000 (18:58 -0700)]
ART: Unlink target oat file before compiling
Dex2oat must create a new file (new inode) when writing to a target
given by name, as the existing file may be in use. So unlink any
existing file first.
Bug:
22047255
(cherry picked from commit
52f0aeb8e9f16fa5c3067f6a36be701354448924)
Change-Id: Ief942c71564076e39c1e8340d5c4c55286f75896
Roland Levillain [Tue, 30 Jun 2015 15:15:37 +0000 (15:15 +0000)]
am
6d6b30e5: Merge "Make compiler-related gtests honor ART_USE_OPTIMIZING_COMPILER."
* commit '
6d6b30e57bc00d701c92d830ce47f2ee9c20ef00':
Make compiler-related gtests honor ART_USE_OPTIMIZING_COMPILER.
Roland Levillain [Tue, 30 Jun 2015 15:05:03 +0000 (15:05 +0000)]
Merge "Make compiler-related gtests honor ART_USE_OPTIMIZING_COMPILER."
Roland Levillain [Tue, 30 Jun 2015 13:16:48 +0000 (14:16 +0100)]
Make compiler-related gtests honor ART_USE_OPTIMIZING_COMPILER.
Previously, gtests using the art::CommonCompilerTest
class were using Quick as compiler. Now, setting the
environment variable ART_USE_OPTIMIZING_COMPILER to `true`
before building and running these tests will use Optimizing
instead.
Change-Id: I724a3215d2eb1841089745fbabb5cb58b0422ef3
Sebastien Hertz [Tue, 30 Jun 2015 11:57:39 +0000 (13:57 +0200)]
Properly delete temp files during run-test
Bug:
22190679
Change-Id: Ic5cb98d296df924d9ee724c757c526ad70744612
Evgenii Stepanov [Mon, 29 Jun 2015 23:23:34 +0000 (16:23 -0700)]
Explicitly link libz-host to libart.
A change in system/core/libziparchive will make libziparchive-host
depend on libz-host as a shared library instead of a static library.
As a result, only on MacOS, libziparchive-host will stop re-exporting
libz-host interface. Libart uses both and must link both.
Change-Id: Ie4ae9b27903cbcbdb2d2043969a7fceba32249be
Aart Bik [Mon, 29 Jun 2015 18:03:55 +0000 (11:03 -0700)]
Added index type of dex byte instructions.
Rationale:
The information was already in the instruction_list but not
exposed as enum through a getter. This CL adds that ability.
This information is needed by the upcoming Art-based dexdump.
NOTE:
Added "Index" to the enum constants naming convention.
NOTE:
Fixed few incorrect quickened entries in instruction_list.
Bug:
17442393
Change-Id: Ica18ae43135f78f29e9832f5a101d497e54724cf
Andreas Gampe [Mon, 29 Jun 2015 21:09:36 +0000 (21:09 +0000)]
am
3b0667c1: Merge "ART: Fix CFI annotation for art_quick_aput_obj"
* commit '
3b0667c1d68ba88c71b031757b757dca659afd69':
ART: Fix CFI annotation for art_quick_aput_obj
Andreas Gampe [Mon, 29 Jun 2015 21:01:14 +0000 (21:01 +0000)]
Merge "ART: Fix CFI annotation for art_quick_aput_obj"
Yusuke Sato [Mon, 29 Jun 2015 18:01:07 +0000 (18:01 +0000)]
am
b508ccd8: Merge "Rename ZipEntryName to ZipString"
* commit '
b508ccd83e76de16e9d19e8cb010b41a1651556a':
Rename ZipEntryName to ZipString
Yusuke Sato [Mon, 29 Jun 2015 17:49:28 +0000 (17:49 +0000)]
Merge "Rename ZipEntryName to ZipString"
Mathieu Chartier [Sat, 27 Jun 2015 22:42:27 +0000 (15:42 -0700)]
ART: Fix CFI annotation for art_quick_aput_obj
Fix the CFI state after an early return.
Bug:
22014525
Change-Id: I56b9ba8cf8c47d70a642f064e59c7e04a476dd2f
Nicolas Geoffray [Mon, 29 Jun 2015 14:17:05 +0000 (14:17 +0000)]
am
806af26f: Merge "Do not replace a live phi with a dead phi."
* commit '
806af26f1a8f107cb4f4430ceec8dc9f360f3795':
Do not replace a live phi with a dead phi.
Nicolas Geoffray [Mon, 29 Jun 2015 14:03:00 +0000 (14:03 +0000)]
Merge "Do not replace a live phi with a dead phi."
Nicolas Geoffray [Mon, 29 Jun 2015 13:34:46 +0000 (14:34 +0100)]
Do not replace a live phi with a dead phi.
A dead phi is not properly typed. Therefore, always use the live phi
equivalent instead.
bug:
21865466
Change-Id: Id5e26ae4062cc18f5532d5b95cc024480652d5b2
Nicolas Geoffray [Mon, 29 Jun 2015 13:11:29 +0000 (13:11 +0000)]
am
f91d27c9: Merge "Revert "Revert "Do not update the type of something we already know."""
* commit '
f91d27c907589c2b678315793992f09f9acc2e8b':
Revert "Revert "Do not update the type of something we already know.""
Nicolas Geoffray [Mon, 29 Jun 2015 13:04:19 +0000 (13:04 +0000)]
Merge "Revert "Revert "Do not update the type of something we already know."""
Nicolas Geoffray [Mon, 29 Jun 2015 12:43:54 +0000 (13:43 +0100)]
Revert "Revert "Do not update the type of something we already know.""
This reverts commit
63107a804ce17db9789051e1fe310d99d1dae1cb.
bug:
22116987
Change-Id: I49a376a5bd2073a69babe122ec0d26e5d2f82461
Calin Juravle [Mon, 29 Jun 2015 11:50:53 +0000 (11:50 +0000)]
am
2e232ce8: Merge "Revert "Do not update the type of something we already know.""
* commit '
2e232ce8c7e7accc1b9654f111266d28fe45b08d':
Revert "Do not update the type of something we already know."
Calin Juravle [Mon, 29 Jun 2015 11:43:39 +0000 (11:43 +0000)]
Merge "Revert "Do not update the type of something we already know.""
Calin Juravle [Mon, 29 Jun 2015 11:43:16 +0000 (11:43 +0000)]
Revert "Do not update the type of something we already know."
This reverts commit
30eb58c548bee08468f68eb140a74a51dd7d9b43.
Change-Id: Icd959e868160fc3ee7031dd2927554ac5b21d40f
Nicolas Geoffray [Mon, 29 Jun 2015 11:14:38 +0000 (11:14 +0000)]
am
f67156eb: Merge "Do not update the type of something we already know."
* commit '
f67156eb8027fb0be7e2e3ec5fdb4323134ae10d':
Do not update the type of something we already know.
Nicolas Geoffray [Mon, 29 Jun 2015 11:03:34 +0000 (11:03 +0000)]
Merge "Do not update the type of something we already know."
Nicolas Geoffray [Mon, 29 Jun 2015 09:56:34 +0000 (10:56 +0100)]
Do not update the type of something we already know.
This is both an optimization to avoid unneeded nodes,
and correctness to avoid replacing the second input
of `HInstanceOf` and `HCheckCast` to something that is
not `HLoadClass`.
bug:
22116987
Change-Id: I4907197a9002883d7cae8265a9642512b6201396
Roland Levillain [Mon, 29 Jun 2015 09:42:51 +0000 (09:42 +0000)]
am
d1c897df: Merge "Exercise sun.misc.Unsafe.compareAndSwapObject."
* commit '
d1c897df8818f2329492f9befb046927be390d90':
Exercise sun.misc.Unsafe.compareAndSwapObject.
Roland Levillain [Mon, 29 Jun 2015 08:17:39 +0000 (08:17 +0000)]
Merge "Exercise sun.misc.Unsafe.compareAndSwapObject."
Bill Buzbee [Sat, 27 Jun 2015 14:17:26 +0000 (14:17 +0000)]
am
0bf76878: Merge "Quick: Disable GVN, DCE and LVN for type conflicts."
* commit '
0bf76878a7784b4e0f21ace82d891bf0b760aaac':
Quick: Disable GVN, DCE and LVN for type conflicts.
Bill Buzbee [Sat, 27 Jun 2015 14:06:42 +0000 (14:06 +0000)]
Merge "Quick: Disable GVN, DCE and LVN for type conflicts."
Vladimir Marko [Sat, 27 Jun 2015 12:44:06 +0000 (13:44 +0100)]
Quick: Fix a DCHECK to take type conflicts into account.
Bug:
21865466
Change-Id: I010c7058b5a58bea1ec61af5bd6a12c2eb8de1b4
Vladimir Marko [Sat, 27 Jun 2015 12:32:11 +0000 (13:32 +0100)]
Quick: Disable GVN, DCE and LVN for type conflicts.
Bug:
22136903
Change-Id: I657d4b5e623696e1264c2c6c9ad4e7fd466d759c
Mathieu Chartier [Sat, 27 Jun 2015 03:15:19 +0000 (03:15 +0000)]
am
9a83f593: Merge "Fixed a nullptr bug in SweepAllocationRecords()"
* commit '
9a83f59365443eead29a318fe28916df9412a720':
Fixed a nullptr bug in SweepAllocationRecords()
Andreas Gampe [Sat, 27 Jun 2015 03:09:28 +0000 (03:09 +0000)]
am
8db4a7c8: Merge "ART: Fix CFI annotation in arm64, x86 and x86-64 assembly"
* commit '
8db4a7c8f1327655d09a7737ad3a8c4e5ec37d84':
ART: Fix CFI annotation in arm64, x86 and x86-64 assembly
Mathieu Chartier [Sat, 27 Jun 2015 03:08:44 +0000 (03:08 +0000)]
Merge "Fixed a nullptr bug in SweepAllocationRecords()"