OSDN Git Service

android-x86/art.git
8 years agoam 259d6638: (-s ours) am 2ada67b3: Don\'t dump stack when deleting an invalid local ref
Mathieu Chartier [Thu, 27 Aug 2015 04:07:57 +0000 (04:07 +0000)]
am 259d6638: (-s ours) am 2ada67b3: Don\'t dump stack when deleting an invalid local ref

* commit '259d6638ecbf6957c10ae31e9038c0c9cb6ab151':

8 years agoam 4a94d779: (-s ours) am 57d92494: am 8433bb8a: Merge "ART: Fix gtest after GraphChe...
David Brazdil [Thu, 27 Aug 2015 04:07:52 +0000 (04:07 +0000)]
am 4a94d779: (-s ours) am 57d92494: am 8433bb8a: Merge "ART: Fix gtest after GraphChecker CL"

* commit '4a94d779f43623114ffaf532999b3218cb81534f':

8 years agoam af420847: (-s ours) Merge "resolved conflicts for merge of 8f96df84 to mnc-dev...
Roland Levillain [Thu, 27 Aug 2015 04:07:47 +0000 (04:07 +0000)]
am af420847: (-s ours) Merge "resolved conflicts for merge of 8f96df84 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp

* commit 'af420847ed4c2c83984b18daa86cc8485f6db681':

8 years agoam 053c1d86: (-s ours) am 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead...
Andreas Gampe [Thu, 27 Aug 2015 04:07:43 +0000 (04:07 +0000)]
am 053c1d86: (-s ours) am 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS"

* commit '053c1d86251600af04d29dcb1727631a6847dbf3':

8 years agoam 527860a2: (-s ours) am 5fa76856: am a302e913: Merge "ART: Store and check exceptio...
David Brazdil [Thu, 27 Aug 2015 04:07:39 +0000 (04:07 +0000)]
am 527860a2: (-s ours) am 5fa76856: am a302e913: Merge "ART: Store and check exceptional predecessors"

* commit '527860a2c82b0eb29fc0e5e3f560740d044c3b20':

8 years agoam fd1839eb: (-s ours) am 4111d09c: am 7b926cda: Merge "Clear temporary class arrays...
Mathieu Chartier [Thu, 27 Aug 2015 04:07:34 +0000 (04:07 +0000)]
am fd1839eb: (-s ours) am 4111d09c: am 7b926cda: Merge "Clear temporary class arrays before linking the new class"

* commit 'fd1839eb99d5088c7062d8f66cde5e547f61481c':

8 years agoam 150427a1: (-s ours) am 47f6198e: am 3247ce51: Merge "Register signal handler to...
Andreas Gampe [Thu, 27 Aug 2015 04:07:30 +0000 (04:07 +0000)]
am 150427a1: (-s ours) am 47f6198e: am 3247ce51: Merge "Register signal handler to kernel if not claimed"

* commit '150427a1e2a622d2e1c239cefbc4c2c2813cfbeb':

8 years agoam c423bec7: (-s ours) am c1ba0605: am 1569aad2: Merge "ART: Relax IsInstantiable...
Andreas Gampe [Thu, 27 Aug 2015 04:07:26 +0000 (04:07 +0000)]
am c423bec7: (-s ours) am c1ba0605: am 1569aad2: Merge "ART: Relax IsInstantiable check"

* commit 'c423bec76551011d5c4e2509bc7ea7c92ddc1b6c':

8 years agoam 901a98c6: (-s ours) am 60ee2840: am 36c51fc2: Merge "Take into account that we...
Calin Juravle [Thu, 27 Aug 2015 04:07:22 +0000 (04:07 +0000)]
am 901a98c6: (-s ours) am 60ee2840: am 36c51fc2: Merge "Take into account that we might end up with unresolved classes."

* commit '901a98c636b3d75688a90ee158c516e5ad8eaf0e':

8 years agoam a048e5f0: (-s ours) am a127607e: am 57a9c7d3: Merge "Fix gtests."
Calin Juravle [Thu, 27 Aug 2015 04:07:18 +0000 (04:07 +0000)]
am a048e5f0: (-s ours) am a127607e: am 57a9c7d3: Merge "Fix gtests."

* commit 'a048e5f0666d809a1d3973b1e939fd2600cd8633':

8 years agoam 9078357f: (-s ours) am 94b37fc9: am b9318481: Merge "Allow for fine tuning the...
Calin Juravle [Thu, 27 Aug 2015 04:07:14 +0000 (04:07 +0000)]
am 9078357f: (-s ours) am 94b37fc9: am b9318481: Merge "Allow for fine tuning the inliner."

* commit '9078357f780af7b35ec89880db2259c4ddda3819':

8 years agoam 7de2d616: (-s ours) am d22cbfa8: am 57c0f3f3: Merge "Clean up class visitors"
Mathieu Chartier [Thu, 27 Aug 2015 04:07:10 +0000 (04:07 +0000)]
am 7de2d616: (-s ours) am d22cbfa8: am 57c0f3f3: Merge "Clean up class visitors"

* commit '7de2d616a82c7545804aaa1d2e6a92cc06680fe5':

8 years agoam 625efc3a: (-s ours) am 53201ec3: am 8c4113b8: Merge "Revert "Revert "Revert "Rever...
Calin Juravle [Thu, 27 Aug 2015 04:07:06 +0000 (04:07 +0000)]
am 625efc3a: (-s ours) am 53201ec3: am 8c4113b8: Merge "Revert "Revert "Revert "Revert "Use the object class as top in reference type propagation"""""

* commit '625efc3a45b9f34d6290527d32e1e0bb422f755b':

8 years agoam ee9dc6c4: (-s ours) am ae674978: am 3dac766e: Merge "Revert "Revert "Revert "Rever...
Calin Juravle [Thu, 27 Aug 2015 04:07:01 +0000 (04:07 +0000)]
am ee9dc6c4: (-s ours) am ae674978: am 3dac766e: Merge "Revert "Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation"""""

* commit 'ee9dc6c4279fd47901f41473c254d602bcdb4df1':

8 years agoam b67c281b: (-s ours) am fe4c8934: am 0f8c6daf: Merge "Run intrinsics on inlined...
Roland Levillain [Thu, 27 Aug 2015 04:06:57 +0000 (04:06 +0000)]
am b67c281b: (-s ours) am fe4c8934: am 0f8c6daf: Merge "Run intrinsics on inlined code."

* commit 'b67c281bbdae5e84f16a149e054a8151f5c47e81':

8 years agoam d425f8a7: (-s ours) am 7ab92ace: am aac04677: Merge "Split the class table for...
Mathieu Chartier [Thu, 27 Aug 2015 04:06:54 +0000 (04:06 +0000)]
am d425f8a7: (-s ours) am 7ab92ace: am aac04677: Merge "Split the class table for each class loader"

* commit 'd425f8a7c1168bbf651e0b7dd85e3e52257cf651':

8 years agoam a5559850: (-s ours) am 94ac13eb: am 3f680bea: Merge "Add read barrier support...
Mathieu Chartier [Thu, 27 Aug 2015 04:06:50 +0000 (04:06 +0000)]
am a5559850: (-s ours) am 94ac13eb: am 3f680bea: Merge "Add read barrier support to the entrypoints."

* commit 'a55598508f9ea681acdfaaa6fd7f524bc6d24149':

8 years agoam 6c3556d2: (-s ours) am 681652d8: HDeoptimize should hold values live in env.
Mingyao Yang [Thu, 27 Aug 2015 04:06:46 +0000 (04:06 +0000)]
am 6c3556d2: (-s ours) am 681652d8: HDeoptimize should hold values live in env.

* commit '6c3556d24f7f7c835c4a77bbb081ccfaf96789f7':

8 years agoam 169bb42f: (-s ours) am 82beb6c0: am 1a4d013b: Merge "Temporarily suppress TimeZone...
Narayan Kamath [Thu, 27 Aug 2015 04:06:41 +0000 (04:06 +0000)]
am 169bb42f: (-s ours) am 82beb6c0: am 1a4d013b: Merge "Temporarily suppress TimeZoneTest.testAllDisplayNames."

* commit '169bb42f38990546d3718d21a62867b857a5ab86':

8 years agoam 02c921a8: (-s ours) am 195ba565: am 59533510: Merge "ART: Print out hex for NewStr...
Andreas Gampe [Thu, 27 Aug 2015 04:06:37 +0000 (04:06 +0000)]
am 02c921a8: (-s ours) am 195ba565: am 59533510: Merge "ART: Print out hex for NewStringUTF failure"

* commit '02c921a89942fc388cb0c47d60f1632ac3f27034':

8 years agoam b7fed7eb: (-s ours) am 6589fee1: am 6df1d46a: Merge "Revert "Revert "Revert "Fixes...
Calin Juravle [Thu, 27 Aug 2015 04:06:32 +0000 (04:06 +0000)]
am b7fed7eb: (-s ours) am 6589fee1: am 6df1d46a: Merge "Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation""""

* commit 'b7fed7eb4badadfb37c6894e24fc7c61c212ba1e':

8 years agoam 1924456a: (-s ours) am 76d53973: am 431403ad: Merge "Revert "Revert "Revert "Use...
Calin Juravle [Thu, 27 Aug 2015 04:06:27 +0000 (04:06 +0000)]
am 1924456a: (-s ours) am 76d53973: am 431403ad: Merge "Revert "Revert "Revert "Use the object class as top in reference type propagation""""

* commit '1924456a45d2184394ab9f719076ea191c7c0952':

8 years agoam 893e43ad: (-s ours) am dc189335: am 48215e2e: Merge "Revert "Revert "Use the objec...
Calin Juravle [Thu, 27 Aug 2015 04:06:14 +0000 (04:06 +0000)]
am 893e43ad: (-s ours) am dc189335: am 48215e2e: Merge "Revert "Revert "Use the object class as top in reference type propagation"""

* commit '893e43ad7a6ceee1620c1aa4f57b8a13747c0247':

8 years agoam 15ceaa83: (-s ours) am 5bc48dc0: am 5716a1f0: Merge "Revert "Revert "Fixes and...
Calin Juravle [Thu, 27 Aug 2015 04:06:08 +0000 (04:06 +0000)]
am 15ceaa83: (-s ours) am 5bc48dc0: am 5716a1f0: Merge "Revert "Revert "Fixes and improvements in ReferenceTypePropagation"""

* commit '15ceaa83489ebbfb55d10e53aa1f489915b1e928':

8 years agoam 82bcf3b3: (-s ours) am 6131b654: am 9af8d8dd: Merge "Added repe_cmpsw instruction...
Roland Levillain [Thu, 27 Aug 2015 04:06:01 +0000 (04:06 +0000)]
am 82bcf3b3: (-s ours) am 6131b654: am 9af8d8dd: Merge "Added repe_cmpsw instruction to x86, x86_64 assemblers"

* commit '82bcf3b3ab8c5916bec21119c88b5471c0feaaf1':

8 years agoam 59238f53: (-s ours) am af50e415: Bugfix: Java char is 16 bits, can not be treated...
Fredrik Roubert [Thu, 27 Aug 2015 04:05:56 +0000 (04:05 +0000)]
am 59238f53: (-s ours) am af50e415: Bugfix: Java char is 16 bits, can not be treated as boolean.

* commit '59238f535100d79b38717a38913c2d78d89b794a':

8 years agoam bce159d8: (-s ours) am b5bfb2ab: am 73961d95: Merge "Add remembered set functional...
Mathieu Chartier [Thu, 27 Aug 2015 04:05:50 +0000 (04:05 +0000)]
am bce159d8: (-s ours) am b5bfb2ab: am 73961d95: Merge "Add remembered set functionality for native roots"

* commit 'bce159d8959bba941b40062527139802a549f631':

8 years agoam d77c8428: (-s ours) am 0327b9b9: am 6e67b579: Merge "Bugfix: Java char is 16 bits...
Mathieu Chartier [Thu, 27 Aug 2015 04:05:38 +0000 (04:05 +0000)]
am d77c8428: (-s ours) am 0327b9b9: am 6e67b579: Merge "Bugfix: Java char is 16 bits, can not be treated as boolean."

* commit 'd77c842824253f93b8031be7e17af568d8771f70':

8 years agoam 99455c76: (-s ours) am 6dc1f8da: am 41bad0ef: Merge "HDeoptimize should hold value...
Mingyao Yang [Thu, 27 Aug 2015 04:05:30 +0000 (04:05 +0000)]
am 99455c76: (-s ours) am 6dc1f8da: am 41bad0ef: Merge "HDeoptimize should hold values live in env."

* commit '99455c7698f81ea587d86432ee8b16c96cf4e16a':

8 years agoam e8c4cb4a: (-s ours) am 619db792: am 9578d10b: Merge "Add checker ability to 525...
Aart Bik [Thu, 27 Aug 2015 04:05:14 +0000 (04:05 +0000)]
am e8c4cb4a: (-s ours) am 619db792: am 9578d10b: Merge "Add checker ability to 525-arrays-and-fields tests."

* commit 'e8c4cb4a3bc0b0530aacab3a681f959312e8c47e':

8 years agoam 7e66920c: (-s ours) am 9e7e2b59: am 35dfc983: Merge "Exercise constant folding...
Roland Levillain [Thu, 27 Aug 2015 04:05:06 +0000 (04:05 +0000)]
am 7e66920c: (-s ours) am 9e7e2b59: am 35dfc983: Merge "Exercise constant folding of int & long mul, div and rem."

* commit '7e66920caae8711d8d64b482523fab7c18cbd8af':

8 years agoam 0d4f9e00: (-s ours) am df62615b: am 87bada67: Merge "Cosmetic changes in ART run...
Roland Levillain [Thu, 27 Aug 2015 04:04:59 +0000 (04:04 +0000)]
am 0d4f9e00: (-s ours) am df62615b: am 87bada67: Merge "Cosmetic changes in ART run-tests."

* commit '0d4f9e000cdd61e823f4b334abc7c2684ccaba5d':

8 years agoam 528e3a8f: (-s ours) am 814a1604: am ee1e8987: Merge "Fix & add Checker assertions...
Roland Levillain [Thu, 27 Aug 2015 04:04:52 +0000 (04:04 +0000)]
am 528e3a8f: (-s ours) am 814a1604: am ee1e8987: Merge "Fix & add Checker assertions in 442-checker-constant-folding."

* commit '528e3a8f77bfd94b4646bda6ceda9cea37f066de':

8 years agoam d897e28c: (-s ours) am 0117cfef: am 0fae2f58: Merge "Enable art host static builds...
Calin Juravle [Thu, 27 Aug 2015 04:04:48 +0000 (04:04 +0000)]
am d897e28c: (-s ours) am 0117cfef: am 0fae2f58: Merge "Enable art host static builds only for checkbuilds."

* commit 'd897e28c29aec1744d4ea4f9701e24a0217dc3e2':

8 years agoam a174894c: (-s ours) am 7f925348: am 939e702b: Merge "ART: Abbreviate interpreter...
Andreas Gampe [Thu, 27 Aug 2015 04:04:42 +0000 (04:04 +0000)]
am a174894c: (-s ours) am 7f925348: am 939e702b: Merge "ART: Abbreviate interpreter-access-checks"

* commit 'a174894cfec4c9ad7e7adbf72dc237b24ad6c0e6':

8 years agoam be1c4606: (-s ours) am bb26acb9: am a09d5df5: Merge "Fix gcstress tests"
Mathieu Chartier [Thu, 27 Aug 2015 04:04:38 +0000 (04:04 +0000)]
am be1c4606: (-s ours) am bb26acb9: am a09d5df5: Merge "Fix gcstress tests"

* commit 'be1c460680fe043220cb27468d743673b506497d':

8 years agoam a2139638: (-s ours) am 6b557d3d: am 34e1ed2f: Merge "ART: Make warnings into error...
Andreas Gampe [Thu, 27 Aug 2015 04:04:34 +0000 (04:04 +0000)]
am a2139638: (-s ours) am 6b557d3d: am 34e1ed2f: Merge "ART: Make warnings into errors in InitZygote"

* commit 'a2139638e9e7cf2f45c021cede084a8d383ca445':

8 years agoam b0107fc4: (-s ours) am c021cc4e: am e3ab2a7d: Merge "ART: Change the stack dump...
Andreas Gampe [Thu, 27 Aug 2015 04:04:30 +0000 (04:04 +0000)]
am b0107fc4: (-s ours) am c021cc4e: am e3ab2a7d: Merge "ART: Change the stack dump format to be in line with debuggerd"

* commit 'b0107fc456894cf9a44c1a802b9eb2499194346f':

8 years agoam a557f226: (-s ours) am 0c21b5cc: am 8f3402e7: Merge "Revert "runtest: Have gcstres...
Igor Murashkin [Thu, 27 Aug 2015 04:04:27 +0000 (04:04 +0000)]
am a557f226: (-s ours) am 0c21b5cc: am 8f3402e7: Merge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""

* commit 'a557f2266c27c2f6d19d9c938052ff29a3bf683e':

8 years agoam 12f0c7ee: (-s ours) am 458a7c7a: (-s ours) Merge "ART: Change the stack dump forma...
Andreas Gampe [Thu, 27 Aug 2015 04:04:25 +0000 (04:04 +0000)]
am 12f0c7ee: (-s ours) am 458a7c7a: (-s ours) Merge "ART: Change the stack dump format to be in line with debuggerd" into mnc-dev

* commit '12f0c7ee9898a24b2c1af8eb98a44d5300db9337':

8 years agoam 2e6a4878: (-s ours) am 2f0f97c5: am 0fc01dd3: Merge "Visit class native roots...
Mathieu Chartier [Thu, 27 Aug 2015 04:04:23 +0000 (04:04 +0000)]
am 2e6a4878: (-s ours) am 2f0f97c5: am 0fc01dd3: Merge "Visit class native roots from VisitReferences"

* commit '2e6a4878e661498747d981c36f5d7c8060d30857':

8 years agoam 3b58e56d: (-s ours) am d021e166: ART: Fix Quick/Optimizing suspend check assumptio...
Vladimir Marko [Thu, 27 Aug 2015 04:04:21 +0000 (04:04 +0000)]
am 3b58e56d: (-s ours) am d021e166: ART: Fix Quick/Optimizing suspend check assumption mismatch.

* commit '3b58e56de3bf60718c31e7cd6da3fc8279a2376d':

8 years agoam 48d8441f: (-s ours) am cd731ca7: am 2a7ea34c: Merge "Add some more uninterruptible...
Mathieu Chartier [Thu, 27 Aug 2015 04:04:20 +0000 (04:04 +0000)]
am 48d8441f: (-s ours) am cd731ca7: am 2a7ea34c: Merge "Add some more uninterruptible annotations"

* commit '48d8441f7d0fac187deff79786532fcdab83b059':

8 years agoam b78547d0: (-s ours) am 71ab1c96: am 20cd654b: Merge "Fix alignments in quick_entry...
Mathieu Chartier [Thu, 27 Aug 2015 04:04:18 +0000 (04:04 +0000)]
am b78547d0: (-s ours) am 71ab1c96: am 20cd654b: Merge "Fix alignments in quick_entrypoints_x86_64.S"

* commit 'b78547d0f08bef270e282f6856ccfaf99652bd44':

8 years agoam c3f7b4ec: (-s ours) am dd812fa1: am f7efc9ef: Merge "ART: Fix Quick/Optimizing...
Vladimir Marko [Thu, 27 Aug 2015 04:04:16 +0000 (04:04 +0000)]
am c3f7b4ec: (-s ours) am dd812fa1: am f7efc9ef: Merge "ART: Fix Quick/Optimizing suspend check assumption mismatch."

* commit 'c3f7b4ec15b7462bb1d010d226192201cbe84ca0':

8 years agoam 57704c16: (-s ours) am 76aabf7f: am bea4eb4b: Merge "Disable Checker for tests...
David Brazdil [Thu, 27 Aug 2015 04:04:15 +0000 (04:04 +0000)]
am 57704c16: (-s ours) am 76aabf7f: am bea4eb4b: Merge "Disable Checker for tests that don\'t invoke the compiler."

* commit '57704c165a6ac609819deb4c41c5c6492320c8e0':

8 years agoam ea980171: (-s ours) am e14a10aa: am bd76db36: Merge "Fix and extend the documentat...
Roland Levillain [Thu, 27 Aug 2015 04:04:13 +0000 (04:04 +0000)]
am ea980171: (-s ours) am e14a10aa: am bd76db36: Merge "Fix and extend the documentation of art::Thread\'s fields offsets."

* commit 'ea9801716ac0ed5303f43de7a216922346d869c2':

8 years agoam c271d7e8: (-s ours) am 8a035325: am 195fa34d: Merge "ART: Fix missing role definition"
Andreas Gampe [Thu, 27 Aug 2015 04:04:11 +0000 (04:04 +0000)]
am c271d7e8: (-s ours) am 8a035325: am 195fa34d: Merge "ART: Fix missing role definition"

* commit 'c271d7e8c6f3ef0f52b1975e5f2ef40fb9f90ce0':

8 years agoam ff3957dc: (-s ours) am 14e093db: am d59f0b19: Merge "Fix hash set memory leaks"
Mathieu Chartier [Thu, 27 Aug 2015 04:04:09 +0000 (04:04 +0000)]
am ff3957dc: (-s ours) am 14e093db: am d59f0b19: Merge "Fix hash set memory leaks"

* commit 'ff3957dc6b3119f07ee3a2ee15815aa285426c7e':

8 years agoam deb7c9bd: (-s ours) am d5a482cb: am 3c9c7760: Merge "Add uninterruptible role"
Mathieu Chartier [Thu, 27 Aug 2015 04:04:07 +0000 (04:04 +0000)]
am deb7c9bd: (-s ours) am d5a482cb: am 3c9c7760: Merge "Add uninterruptible role"

* commit 'deb7c9bd0a876382feb5a2fd9b14ab5c31ac6902':

8 years agoam a5857a48: (-s ours) am 372e3bee: am f64914d7: Merge "Move to newer clang annotations"
Mathieu Chartier [Thu, 27 Aug 2015 04:04:04 +0000 (04:04 +0000)]
am a5857a48: (-s ours) am 372e3bee: am f64914d7: Merge "Move to newer clang annotations"

* commit 'a5857a48b6f5ca47bb82755f9edcb72d5cc6d79a':

8 years agoam 330ad0fc: (-s ours) am a7cae0a6: am fab0712a: Merge "runtest: Have gcstress tests...
Igor Murashkin [Thu, 27 Aug 2015 04:04:02 +0000 (04:04 +0000)]
am 330ad0fc: (-s ours) am a7cae0a6: am fab0712a: Merge "runtest: Have gcstress tests skip 955-lambda-smali"

* commit '330ad0fcdd197799d6685e079450ccae42921e05':

8 years agoam f2ff5e40: (-s ours) am 41c2b27b: am 6078aec2: Merge "ART: Add VerboseMethods to...
Andreas Gampe [Thu, 27 Aug 2015 04:04:00 +0000 (04:04 +0000)]
am f2ff5e40: (-s ours) am 41c2b27b: am 6078aec2: Merge "ART: Add VerboseMethods to optimizing compiler"

* commit 'f2ff5e4001d2e81327028e239c754668a1f49e81':

8 years agoam 37308c9f: (-s ours) am 67496bfb: am d8da9dc8: Merge "More diagnostics for flaky...
Richard Uhler [Thu, 27 Aug 2015 04:03:58 +0000 (04:03 +0000)]
am 37308c9f: (-s ours) am 67496bfb: am d8da9dc8: Merge "More diagnostics for flaky oat file assistant test."

* commit '37308c9f883640952dd501c1cbdf9755d746abe5':

8 years agoam d09066dd: (-s ours) am 8d060f27: am c20d7286: Merge "Replaced CHECK with EXPECT...
Aart Bik [Thu, 27 Aug 2015 04:03:56 +0000 (04:03 +0000)]
am d09066dd: (-s ours) am 8d060f27: am c20d7286: Merge "Replaced CHECK with EXPECT in tests."

* commit 'd09066dda2bb5a10c2f38cf83f4b1fd473ce3e8f':

8 years agoam fbcab05c: (-s ours) am 88d751b2: am c5bee2a1: Merge "Revert "Fixes and improvement...
Calin Juravle [Thu, 27 Aug 2015 04:03:54 +0000 (04:03 +0000)]
am fbcab05c: (-s ours) am 88d751b2: am c5bee2a1: Merge "Revert "Fixes and improvements in ReferenceTypePropagation""

* commit 'fbcab05c2b22d16d9a5241114590b6001cd164d3':

8 years agoam 82c1325d: (-s ours) am ccc2dda7: am 32d7806b: Merge "Revert "Use the object class...
Calin Juravle [Thu, 27 Aug 2015 04:03:51 +0000 (04:03 +0000)]
am 82c1325d: (-s ours) am ccc2dda7: am 32d7806b: Merge "Revert "Use the object class as top in reference type propagation""

* commit '82c1325dcdcc95c7a6e38b547cc2530b663e924a':

8 years agoam b0365b57: (-s ours) am 1705b335: am d77aa00c: Merge "ART: Fix Thumb2 literal fixup."
Vladimir Marko [Thu, 27 Aug 2015 04:03:47 +0000 (04:03 +0000)]
am b0365b57: (-s ours) am 1705b335: am d77aa00c: Merge "ART: Fix Thumb2 literal fixup."

* commit 'b0365b57c1552884a2cde579406679be2d07f788':

8 years agoam 8fdc36de: (-s ours) am 23d9295d: am ff6e79c9: Merge "Added unit tests to LICM."
Aart Bik [Thu, 27 Aug 2015 04:03:42 +0000 (04:03 +0000)]
am 8fdc36de: (-s ours) am 23d9295d: am ff6e79c9: Merge "Added unit tests to LICM."

* commit '8fdc36dec3ff2280d7284fc1bfcdda31d2981bde':

8 years agoam 427c0681: (-s ours) am 998669b2: am 0e126bb7: Merge "When a Checker assertion...
Roland Levillain [Thu, 27 Aug 2015 04:03:36 +0000 (04:03 +0000)]
am 427c0681: (-s ours) am 998669b2: am 0e126bb7: Merge "When a Checker assertion cannot be parsed, display it."

* commit '427c068153e33a5e919a8ab516842bcb4580b3e7':

8 years agoam c138fc05: (-s ours) am 3683469c: am 60f4804f: Merge "Delete extraneous prefix...
Roland Levillain [Thu, 27 Aug 2015 04:03:30 +0000 (04:03 +0000)]
am c138fc05: (-s ours) am 3683469c: am 60f4804f: Merge "Delete extraneous prefix `SideEffects::` in `nodes.h`."

* commit 'c138fc051fbad6d4ac2ed220d3e0c02ba980e3c9':

8 years agoam d00eff42: (-s ours) am 300a6384: am e6e38ce0: Merge "Use the object class as top...
Calin Juravle [Thu, 27 Aug 2015 04:03:24 +0000 (04:03 +0000)]
am d00eff42: (-s ours) am 300a6384: am e6e38ce0: Merge "Use the object class as top in reference type propagation"

* commit 'd00eff421ba78b068d2c248d59e28d9cbe228b21':

8 years agoam 217c5ac5: (-s ours) am 0a3fb002: am a3073e24: Merge "Fixes and improvements in...
Calin Juravle [Thu, 27 Aug 2015 04:03:17 +0000 (04:03 +0000)]
am 217c5ac5: (-s ours) am 0a3fb002: am a3073e24: Merge "Fixes and improvements in ReferenceTypePropagation"

* commit '217c5ac5c28ed10eadb97a33c64ee456ce5bb5cc':

8 years agoam 12704dbb: (-s ours) am 8e9d3f06: am 236d0a3c: Merge changes from topic \'lambda_ex...
Igor Murashkin [Thu, 27 Aug 2015 04:03:05 +0000 (04:03 +0000)]
am 12704dbb: (-s ours) am 8e9d3f06: am 236d0a3c: Merge changes from topic \'lambda_experimental\'

* commit '12704dbbc26cf5491a904916e797146a34c03b08':

8 years agoam 7d6dc9e0: (-s ours) am d72bef09: am c962dd74: Merge "Prefer 32-bit host executable...
Ying Wang [Thu, 27 Aug 2015 04:02:58 +0000 (04:02 +0000)]
am 7d6dc9e0: (-s ours) am d72bef09: am c962dd74: Merge "Prefer 32-bit host executables on Mac."

* commit '7d6dc9e002bee03c3a27a2957270c0e06ce1c6c6':

8 years agoam a2854396: (-s ours) am 0a72d65a: am 56ebee4d: Merge "Add more checks to diagnose...
Richard Uhler [Thu, 27 Aug 2015 04:02:52 +0000 (04:02 +0000)]
am a2854396: (-s ours) am 0a72d65a: am 56ebee4d: Merge "Add more checks to diagnose flaky oat file assistant test."

* commit 'a28543963d6bffecb96cbb79b756b3ed4ea50d3b':

8 years agoam 7725799e: (-s ours) am 9aa5c9be: am 2bb897ea: Merge "Refine the canary pattern...
Andreas Gampe [Thu, 27 Aug 2015 04:02:47 +0000 (04:02 +0000)]
am 7725799e: (-s ours) am 9aa5c9be: am 2bb897ea: Merge "Refine the canary pattern in RedZone"

* commit '7725799ed930a3b09bd26f2ace89afe3da14621c':

8 years agoam 60752832: (-s ours) am be86eabe: Merge "Don\'t check code pointer for proxies...
Mathieu Chartier [Thu, 27 Aug 2015 04:02:42 +0000 (04:02 +0000)]
am 60752832: (-s ours) am be86eabe: Merge "Don\'t check code pointer for proxies in ArtMethod::GetQuickFrameInfo" into mnc-dev

* commit '607528320d3cd02c749861ce2a5fb25e7c4b9b15':

8 years agoam d87bddf8: (-s ours) am 3387f397: Get non proxy method for StackDumpVisitor
Mathieu Chartier [Thu, 27 Aug 2015 04:02:36 +0000 (04:02 +0000)]
am d87bddf8: (-s ours) am 3387f397: Get non proxy method for StackDumpVisitor

* commit 'd87bddf8d1aa14d3a1da0253a3d666370cf36f52':

8 years agoam 3ce5b90c: (-s ours) am e3bab35d: am b203b332: Merge "ART: Fix UninitializedReferen...
Andreas Gampe [Thu, 27 Aug 2015 04:02:33 +0000 (04:02 +0000)]
am 3ce5b90c: (-s ours) am e3bab35d: am b203b332: Merge "ART: Fix UninitializedReference handling"

* commit '3ce5b90ce7faa28dab64f745d4fb7a6bd2203919':

8 years agoam 50727cec: (-s ours) am 75c82d00: am 364fa537: Merge "Fix bug in OatFileAssistant...
Richard Uhler [Thu, 27 Aug 2015 04:02:29 +0000 (04:02 +0000)]
am 50727cec: (-s ours) am 75c82d00: am 364fa537: Merge "Fix bug in OatFileAssistant::GetBestOatFile."

* commit '50727cec42a7717afa19a5fd996f1efe37df15b2':

8 years agoam 5baa96fa: (-s ours) am 7f474a0d: am 411b96d6: Merge "ART: Remove some of the Mac...
Andreas Gampe [Thu, 27 Aug 2015 04:02:27 +0000 (04:02 +0000)]
am 5baa96fa: (-s ours) am 7f474a0d: am 411b96d6: Merge "ART: Remove some of the Mac craziness"

* commit '5baa96fa4216f1a38e692f4d7524896d7c13042c':

8 years agoam e4c66555: (-s ours) am 86aee341: am 9ed82069: Merge "Don\'t check code pointer...
Mathieu Chartier [Thu, 27 Aug 2015 04:02:24 +0000 (04:02 +0000)]
am e4c66555: (-s ours) am 86aee341: am 9ed82069: Merge "Don\'t check code pointer for proxies in ArtMethod::GetQuickFrameInfo"

* commit 'e4c6655532113ca12464f530ef1a410364adcb8d':

8 years agoam 7bc74c27: (-s ours) am c0023fec: am 84bfbe14: Merge "Fix broken tests."
Aart Bik [Thu, 27 Aug 2015 04:02:22 +0000 (04:02 +0000)]
am 7bc74c27: (-s ours) am c0023fec: am 84bfbe14: Merge "Fix broken tests."

* commit '7bc74c272502eac52d77b996ccd5fa8a4d9c19af':

8 years agoam 66a59ccd: (-s ours) am 3495f1ea: am af0365ac: Merge "runtime: Add lambda box/unbox...
Igor Murashkin [Thu, 27 Aug 2015 04:02:19 +0000 (04:02 +0000)]
am 66a59ccd: (-s ours) am 3495f1ea: am af0365ac: Merge "runtime: Add lambda box/unbox object equality"

* commit '66a59ccdf951ec1f2ea18753f44b56d3e279824d':

8 years agoam c9609eaa: (-s ours) am f2d108e1: am e07300b7: Merge "Improved side effect analysis...
Aart Bik [Thu, 27 Aug 2015 04:02:18 +0000 (04:02 +0000)]
am c9609eaa: (-s ours) am f2d108e1: am e07300b7: Merge "Improved side effect analysis (field/array write/read)."

* commit 'c9609eaae66bbf53e7f941448b44c969806d8c3f':

8 years agoam acd4c10d: (-s ours) am 936c7ed9: am 16a150b8: Merge "ART: Fix arm32 quick_invoke_s...
Andreas Gampe [Thu, 27 Aug 2015 04:02:16 +0000 (04:02 +0000)]
am acd4c10d: (-s ours) am 936c7ed9: am 16a150b8: Merge "ART: Fix arm32 quick_invoke_stub CFI"

* commit 'acd4c10d85767a6d70ac1b44530e03b7103dfc38':

8 years agoam 18946002: (-s ours) am f9f0b860: am 6db13772: Merge "Improve documentation of...
Roland Levillain [Thu, 27 Aug 2015 04:02:14 +0000 (04:02 +0000)]
am 18946002: (-s ours) am f9f0b860: am 6db13772: Merge "Improve documentation of memory layouts in stack_map.h."

* commit '189460021aa72b46b1c9a05870201ecac04a7d8f':

8 years agoam cece8875: (-s ours) am cf6fee10: am b2295afd: Merge "Get non proxy method for...
Mathieu Chartier [Thu, 27 Aug 2015 04:02:12 +0000 (04:02 +0000)]
am cece8875: (-s ours) am cf6fee10: am b2295afd: Merge "Get non proxy method for StackDumpVisitor"

* commit 'cece8875bc8769543fd38de31d8f6a613d3a2a39':

8 years agoam 8afd6845: (-s ours) am 3b34cc63: am 11237947: Merge "Change intern table to not...
Mathieu Chartier [Thu, 27 Aug 2015 04:02:09 +0000 (04:02 +0000)]
am 8afd6845: (-s ours) am 3b34cc63: am 11237947: Merge "Change intern table to not use WaitHoldingLocks"

* commit '8afd6845ed34dbcdcf37db047ded8275de18da3a':

8 years agoam 78f9b1a1: (-s ours) am 8cd99c8f: am 7745dc34: Merge "runtime: Add -Xverify:softfai...
Igor Murashkin [Thu, 27 Aug 2015 04:02:05 +0000 (04:02 +0000)]
am 78f9b1a1: (-s ours) am 8cd99c8f: am 7745dc34: Merge "runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS"

* commit '78f9b1a11be03c3d4b4c9de24405e7319b2f31d6':

8 years agoam 051c926c: (-s ours) am 73aca5e9: am 479ebe07: Merge "Extended test with "cross...
Aart Bik [Thu, 27 Aug 2015 04:02:00 +0000 (04:02 +0000)]
am 051c926c: (-s ours) am 73aca5e9: am 479ebe07: Merge "Extended test with "cross-over arrays"."

* commit '051c926c786a39b53fbab8ab911f6ea5fb2aaae4':

8 years agoam 49cdd1ac: (-s ours) am 74c32d6a: am 511bb656: Merge "Fix FieldGap priority queue...
Richard Uhler [Thu, 27 Aug 2015 04:01:56 +0000 (04:01 +0000)]
am 49cdd1ac: (-s ours) am 74c32d6a: am 511bb656: Merge "Fix FieldGap priority queue ordering bug."

* commit '49cdd1ac8fa60728d7e0a20b0a6961cfc561cc2a':

8 years agoam c4a51c65: (-s ours) am 91825544: am 2661ffc6: Merge "Improve Thumb2 branch/load...
Vladimir Marko [Thu, 27 Aug 2015 04:01:53 +0000 (04:01 +0000)]
am c4a51c65: (-s ours) am 91825544: am 2661ffc6: Merge "Improve Thumb2 branch/load-literal fixup performance."

* commit 'c4a51c65f41548095a64abc09742b5bc05546228':

8 years agoam 41d5ea96: (-s ours) am eb4b5b09: am 75fd056e: Merge "Revert "Revert "Use the quick...
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:49 +0000 (04:01 +0000)]
am 41d5ea96: (-s ours) am eb4b5b09: am 75fd056e: Merge "Revert "Revert "Use the quickened metadata to compile -QUICK opcodes."""

* commit '41d5ea96515ced05ef0c8f95a77105d350de6e39':

8 years agoam f609b818: (-s ours) am 030f2af2: Reduce space filter threshold to 128.
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:47 +0000 (04:01 +0000)]
am f609b818: (-s ours) am 030f2af2: Reduce space filter threshold to 128.

* commit 'f609b818f41f3c808fed9ec8fe542d212030aaf7':

8 years agoam b429fe90: (-s ours) am 06fc780f: am 33e50d85: Merge "Reduce space filter threshold...
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:42 +0000 (04:01 +0000)]
am b429fe90: (-s ours) am 06fc780f: am 33e50d85: Merge "Reduce space filter threshold to 128."

* commit 'b429fe90bf2f3115a6c2187367aa64ffd52199f0':

8 years agoam 238c0f54: (-s ours) am 4c310c4c: am 32f59e58: Merge "Revert "Use the quickened...
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:37 +0000 (04:01 +0000)]
am 238c0f54: (-s ours) am 4c310c4c: am 32f59e58: Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""

* commit '238c0f541bcaee9c665167ce041d65b225c83e9a':

8 years agoam a2536109: (-s ours) am 38216947: am c3c0a06b: Merge "Use the quickened metadata...
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:31 +0000 (04:01 +0000)]
am a2536109: (-s ours) am 38216947: am c3c0a06b: Merge "Use the quickened metadata to compile -QUICK opcodes."

* commit 'a2536109694b4332da14cf199c3f0c1306434068':

8 years agoam 7439c5c0: (-s ours) resolved conflicts for merge of a2407de1 to mnc-dev-plus-aosp
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:22 +0000 (04:01 +0000)]
am 7439c5c0: (-s ours) resolved conflicts for merge of a2407de1 to mnc-dev-plus-aosp

* commit '7439c5c0608137bb9bd7524cd54687422743652b':

8 years agoam 2b0d868b: (-s ours) am 2cf3fc24: am 913a737b: Merge "Test on (in)variant static...
Aart Bik [Thu, 27 Aug 2015 04:01:13 +0000 (04:01 +0000)]
am 2b0d868b: (-s ours) am 2cf3fc24: am 913a737b: Merge "Test on (in)variant static and instance field arrays."

* commit '2b0d868bcee5121abbe37ce10bf35f50371495a7':

8 years agoam 9e9bccf0: (-s ours) am 69f77ac2: am caa2fe33: Merge "ART: Fix System.arraycopy"
Andreas Gampe [Thu, 27 Aug 2015 04:00:59 +0000 (04:00 +0000)]
am 9e9bccf0: (-s ours) am 69f77ac2: am caa2fe33: Merge "ART: Fix System.arraycopy"

* commit '9e9bccf090b6a8c8a7d19337c86d7d21703eacef':

8 years agoam 5fa4d5d2: (-s ours) am 082046b3: am 6d3d1e3d: Merge "Disable test while investigat...
Nicolas Geoffray [Thu, 27 Aug 2015 04:00:48 +0000 (04:00 +0000)]
am 5fa4d5d2: (-s ours) am 082046b3: am 6d3d1e3d: Merge "Disable test while investigating."

* commit '5fa4d5d24fa19637afa52fae387aeb492251775f':

8 years agoam 1d24e75f: (-s ours) am 3b7660de: ART: DCE should know that array-length can throw NPE
Serguei Katkov [Thu, 27 Aug 2015 04:00:26 +0000 (04:00 +0000)]
am 1d24e75f: (-s ours) am 3b7660de: ART: DCE should know that array-length can throw NPE

* commit '1d24e75f74b38921f6f0d986031a7ce288d22dae':

8 years agoam 2242f052: (-s ours) am 6f942363: am cced6ad1: Merge "Use (D)CHECK_ALIGNED more."
Roland Levillain [Thu, 27 Aug 2015 04:00:03 +0000 (04:00 +0000)]
am 2242f052: (-s ours) am 6f942363: am cced6ad1: Merge "Use (D)CHECK_ALIGNED more."

* commit '2242f052c3508a6cae27f52d74d3e5b6ff3820b3':

8 years agoam aa8ca8cb: (-s ours) am cda6573b: am 530f3185: Merge "Make oatdump see the new...
Nicolas Geoffray [Thu, 27 Aug 2015 03:59:46 +0000 (03:59 +0000)]
am aa8ca8cb: (-s ours) am cda6573b: am 530f3185: Merge "Make oatdump see the new vmap table generated by dextodex."

* commit 'aa8ca8cb1023218e8c3582c9ca32e4b7f3f3d252':

8 years agoam 21543911: (-s ours) am ad709087: am bca4d299: Merge "ART: Boolean simplifier fix"
Nicolas Geoffray [Thu, 27 Aug 2015 03:59:15 +0000 (03:59 +0000)]
am 21543911: (-s ours) am ad709087: am bca4d299: Merge "ART: Boolean simplifier fix"

* commit '215439119a04d8cdbda19370f24846a9b3497fef':

8 years agoam 525cb2f7: (-s ours) am 709dbfeb: am 8f861e39: Merge "ART: DCE should know that...
Vladimir Marko [Thu, 27 Aug 2015 03:58:55 +0000 (03:58 +0000)]
am 525cb2f7: (-s ours) am 709dbfeb: am 8f861e39: Merge "ART: DCE should know that array-length can throw NPE"

* commit '525cb2f76ebc16523e3d2ba19da4c202c0d4d644':

8 years agoam f5ecdcc3: (-s ours) am 5d558a2b: am fec9d09b: Merge "Fix the documentation of...
Roland Levillain [Thu, 27 Aug 2015 03:58:46 +0000 (03:58 +0000)]
am f5ecdcc3: (-s ours) am 5d558a2b: am fec9d09b: Merge "Fix the documentation of all-run-test-names."

* commit 'f5ecdcc334d36dca18ff4beb09020923c1bdb2aa':

8 years agoam 4b3fd3c5: (-s ours) am 5fe0050e: am 00b5c617: Merge "Use art::MemoryRegion::{Load...
Roland Levillain [Thu, 27 Aug 2015 03:58:31 +0000 (03:58 +0000)]
am 4b3fd3c5: (-s ours) am 5fe0050e: am 00b5c617: Merge "Use art::MemoryRegion::{Load,Store}Bits more in art::CodeInfo."

* commit '4b3fd3c52eadab23e89579e3d0466da46574d44f':