OSDN Git Service
Mingyao Yang [Wed, 18 Nov 2015 21:42:29 +0000 (21:42 +0000)]
Merge "Revert "Revert "Enable store elimination for singleton objects.""" am:
b9bbbeb2b0
am:
fde8cc594d
* commit '
fde8cc594d04320676b5927ab42a81e1926752dd':
Revert "Revert "Enable store elimination for singleton objects.""
Mingyao Yang [Wed, 18 Nov 2015 21:36:44 +0000 (21:36 +0000)]
Merge "Revert "Revert "Enable store elimination for singleton objects."""
am:
b9bbbeb2b0
* commit '
b9bbbeb2b05d74cae0fe0682a26b19f5a7e68d8c':
Revert "Revert "Enable store elimination for singleton objects.""
Mingyao Yang [Wed, 18 Nov 2015 21:29:47 +0000 (21:29 +0000)]
Merge "Revert "Revert "Enable store elimination for singleton objects."""
Mingyao Yang [Mon, 2 Nov 2015 18:56:59 +0000 (10:56 -0800)]
Revert "Revert "Enable store elimination for singleton objects.""
This reverts commit
55d02cf056f993aeafebd54e7b7c68c7a48507c9, and
makes the following change:
Currently we leverage loop side effects to decide whether heap values are
killed by the loop. Stores need to be kept if heap values may be killed
by loops and the corresponding loads cannot be eliminated. Similar thing
need to be done for each predecessor when we merge predecessor heap values.
To do that, the HInstanceFieldSet instruction itself is put in the heap
value array instead of the value of the store instruction. The store
instruction may be added to possibly_removed_stores_ first, but can later
be removed from possibly_removed_stores_ when it's found out that the store
needs to be kept due to merging/loop side effects.
Change-Id: I4f7bb1960f7b47240873e00ff1adac46fc102a02
Mathieu Chartier [Wed, 18 Nov 2015 20:19:12 +0000 (20:19 +0000)]
Merge "Remove incorrect iterator increment" am:
a341377bd5
am:
9cc29ef968
* commit '
9cc29ef968e6a4fa25618a73cd9d170aec7f8471':
Remove incorrect iterator increment
Mathieu Chartier [Wed, 18 Nov 2015 20:12:30 +0000 (20:12 +0000)]
Merge "Remove incorrect iterator increment"
am:
a341377bd5
* commit '
a341377bd5eb7cef471cb29a382e1614523e5a6c':
Remove incorrect iterator increment
Mathieu Chartier [Wed, 18 Nov 2015 20:06:43 +0000 (20:06 +0000)]
Merge "Remove incorrect iterator increment"
Mathieu Chartier [Wed, 18 Nov 2015 18:24:43 +0000 (10:24 -0800)]
Remove incorrect iterator increment
Erase already goes to the next element.
Bug:
25738102
Change-Id: Iea31a7fb27ce9f810acf019a7b59dda7704b8f26
Vladimir Marko [Wed, 18 Nov 2015 18:03:42 +0000 (18:03 +0000)]
Merge "Opt compiler: Arm64 packed-switch jump tables." am:
9231730cd0
am:
a30022e1e5
* commit '
a30022e1e57dd2c07e738e19f77a80d72eb0d65c':
Opt compiler: Arm64 packed-switch jump tables.
Vladimir Marko [Wed, 18 Nov 2015 17:47:01 +0000 (17:47 +0000)]
Merge "Opt compiler: Arm64 packed-switch jump tables."
am:
9231730cd0
* commit '
9231730cd0e285373afd73331168b289309ebee4':
Opt compiler: Arm64 packed-switch jump tables.
Vladimir Marko [Wed, 18 Nov 2015 17:09:04 +0000 (17:09 +0000)]
Merge "Opt compiler: Arm64 packed-switch jump tables."
Zheng Xu [Wed, 18 Nov 2015 09:46:25 +0000 (17:46 +0800)]
Opt compiler: Arm64 packed-switch jump tables.
In this patch, we set a rough threshold and only generate jump table
with limited number of HIRs in the graph. This is because current VIXL
can only handle Adr with label in the range of +/-1Mb.
Change-Id: I42bff2095ec26caeacc5efc90afebe34e229b518
Nicolas Geoffray [Wed, 18 Nov 2015 11:10:47 +0000 (11:10 +0000)]
Merge "Fix bogus DCHECK and rename DidForkFromZygote." am:
349baca032
am:
bc13ef68ca
* commit '
bc13ef68ca632818e0686cd6ea0a971dddb1a2d3':
Fix bogus DCHECK and rename DidForkFromZygote.
Nicolas Geoffray [Wed, 18 Nov 2015 11:06:26 +0000 (11:06 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am:
f5dd91e046
am:
28e7fab960
* commit '
28e7fab96032ca7a2135dd6d665dae83c44ed759':
Remove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Wed, 18 Nov 2015 11:04:46 +0000 (11:04 +0000)]
Merge "Fix bogus DCHECK and rename DidForkFromZygote."
am:
349baca032
* commit '
349baca032735e4a386b74709aa94d17f076cbce':
Fix bogus DCHECK and rename DidForkFromZygote.
Nicolas Geoffray [Wed, 18 Nov 2015 10:56:51 +0000 (10:56 +0000)]
Merge "Fix bogus DCHECK and rename DidForkFromZygote."
Nicolas Geoffray [Wed, 18 Nov 2015 10:55:15 +0000 (10:55 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
am:
f5dd91e046
* commit '
f5dd91e0461b5bb0f401a51dee39f92d52b375e7':
Remove DEBUG_JIT from Zygote flags.
Calin Juravle [Wed, 18 Nov 2015 10:53:42 +0000 (10:53 +0000)]
Merge "Implement common super type in reference type propagation." am:
a4d1b6438f
am:
f22e6c9833
* commit '
f22e6c9833507ccf16bda80167339312b9198994':
Implement common super type in reference type propagation.
Nicolas Geoffray [Tue, 17 Nov 2015 13:50:21 +0000 (13:50 +0000)]
Fix bogus DCHECK and rename DidForkFromZygote.
The method can also be called for non-zygote forked processes.
(cherry picked from commit
9d157e48e0abc48f08fd98e4c5e918d029c1b84c)
Change-Id: Id4f57b77c1a7f802f80e066afcf30afecc198bfc
Calin Juravle [Wed, 18 Nov 2015 10:48:19 +0000 (10:48 +0000)]
Merge "Implement common super type in reference type propagation."
am:
a4d1b6438f
* commit '
a4d1b6438ffaa68307480e8bb40cd18842daa2f3':
Implement common super type in reference type propagation.
Nicolas Geoffray [Wed, 18 Nov 2015 10:47:50 +0000 (10:47 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
Sebastien Hertz [Wed, 18 Nov 2015 10:42:49 +0000 (10:42 +0000)]
Merge "Support deoptimization only to set vreg" am:
a7a3ba792d
am:
5e939d8825
* commit '
5e939d8825fbbdd6872bdca4eda630cb28a8d49f':
Support deoptimization only to set vreg
Calin Juravle [Wed, 18 Nov 2015 10:41:41 +0000 (10:41 +0000)]
Merge "Implement common super type in reference type propagation."
Sebastien Hertz [Wed, 18 Nov 2015 10:37:48 +0000 (10:37 +0000)]
Merge "Support deoptimization only to set vreg"
am:
a7a3ba792d
* commit '
a7a3ba792d608535e4d53ccc3b7a89d110609f12':
Support deoptimization only to set vreg
Sebastien Hertz [Wed, 18 Nov 2015 10:29:22 +0000 (10:29 +0000)]
Merge "Support deoptimization only to set vreg"
Sebastien Hertz [Wed, 18 Nov 2015 10:27:27 +0000 (10:27 +0000)]
Merge "Fix StackVisitor::GetVReg for reference in shadow frame" am:
3e1ff83fb2
am:
64a21f9904
* commit '
64a21f990473039a1454d301c3e133416a1ad992':
Fix StackVisitor::GetVReg for reference in shadow frame
Sebastien Hertz [Wed, 18 Nov 2015 10:22:29 +0000 (10:22 +0000)]
Merge "Fix StackVisitor::GetVReg for reference in shadow frame"
am:
3e1ff83fb2
* commit '
3e1ff83fb210818df66b7a0a7bc70dca6c7b9d47':
Fix StackVisitor::GetVReg for reference in shadow frame
Sebastien Hertz [Wed, 18 Nov 2015 10:17:46 +0000 (10:17 +0000)]
Merge "Fix StackVisitor::GetVReg for reference in shadow frame"
Nicolas Geoffray [Thu, 5 Nov 2015 11:32:24 +0000 (11:32 +0000)]
Remove DEBUG_JIT from Zygote flags.
The flag is being obsolete by the move to JIT.
(cherry picked from commit
0f042e04efba887557e40f981bd9c41b121c4652)
Change-Id: I32c3183e791690964c00fab02a6ee7bbacf6b665
Hiroshi Yamauchi [Tue, 17 Nov 2015 22:28:18 +0000 (22:28 +0000)]
Merge "RosAlloc fast path inline in assembly for x86 32bit." am:
cb6638ff66
am:
48eb86bf6f
* commit '
48eb86bf6f744730fa5054f0465eb4d96614ac9d':
RosAlloc fast path inline in assembly for x86 32bit.
Hiroshi Yamauchi [Tue, 17 Nov 2015 22:22:49 +0000 (22:22 +0000)]
Merge "RosAlloc fast path inline in assembly for x86 32bit."
am:
cb6638ff66
* commit '
cb6638ff664e3136ccfee3cffb9307e0d43ffbc1':
RosAlloc fast path inline in assembly for x86 32bit.
Hiroshi Yamauchi [Tue, 17 Nov 2015 21:53:34 +0000 (21:53 +0000)]
Merge "RosAlloc fast path inline in assembly for x86 32bit."
Mathieu Chartier [Tue, 17 Nov 2015 20:31:53 +0000 (20:31 +0000)]
Merge "Refactor some patching logic" am:
ed42f392f9
am:
faaa970d00
* commit '
faaa970d00a0542326b94e58702856aaa9feaa91':
Refactor some patching logic
Mathieu Chartier [Tue, 17 Nov 2015 20:23:05 +0000 (20:23 +0000)]
Merge "Refactor some patching logic"
am:
ed42f392f9
* commit '
ed42f392f9ae19d24ed2e18b60e146da3920cbf9':
Refactor some patching logic
Mathieu Chartier [Tue, 17 Nov 2015 20:10:24 +0000 (20:10 +0000)]
Merge "Refactor some patching logic"
Calin Juravle [Wed, 11 Nov 2015 16:58:31 +0000 (16:58 +0000)]
Implement common super type in reference type propagation.
Currently only if both types are classes.
Change-Id: I06e98211ead56875a42bd17f099e319b107a50d4
Vladimir Marko [Tue, 17 Nov 2015 17:48:30 +0000 (17:48 +0000)]
Merge "Minor fixes and cleaning of arm64 static and direct calls code." am:
a04f57badc
am:
1a669df880
* commit '
1a669df880d0bc1f4f930a56c78edeca19160ce7':
Minor fixes and cleaning of arm64 static and direct calls code.
Vladimir Marko [Tue, 17 Nov 2015 17:48:21 +0000 (17:48 +0000)]
Merge "ART: add kryo to a53 #835769 & #843419 erratum exception list" am:
9013bb031c
am:
508bb5a032
* commit '
508bb5a0326ce112eb45a3164713e0443fe8380f':
ART: add kryo to a53 #835769 & #843419 erratum exception list
Vladimir Marko [Tue, 17 Nov 2015 17:45:13 +0000 (17:45 +0000)]
Merge "Minor fixes and cleaning of arm64 static and direct calls code."
am:
a04f57badc
* commit '
a04f57badca0a9211d45eb7bde44c1d1e8f159ff':
Minor fixes and cleaning of arm64 static and direct calls code.
Vladimir Marko [Tue, 17 Nov 2015 17:45:04 +0000 (17:45 +0000)]
Merge "ART: add kryo to a53 #835769 & #843419 erratum exception list"
am:
9013bb031c
* commit '
9013bb031c1c3244e70ae246437604f2c094a671':
ART: add kryo to a53 #835769 & #843419 erratum exception list
Vladimir Marko [Tue, 17 Nov 2015 17:40:57 +0000 (17:40 +0000)]
Merge "Minor fixes and cleaning of arm64 static and direct calls code."
Vladimir Marko [Tue, 17 Nov 2015 17:40:34 +0000 (17:40 +0000)]
Merge "ART: add kryo to a53 #835769 & #843419 erratum exception list"
David Brazdil [Tue, 17 Nov 2015 16:54:34 +0000 (16:54 +0000)]
Merge "ART: Refactor GenerateTestAndBranch" am:
3ce45f4e6a
am:
35f0015e7b
* commit '
35f0015e7bd25e3769382b32e5e59d3d019efcb5':
ART: Refactor GenerateTestAndBranch
David Brazdil [Tue, 17 Nov 2015 16:51:33 +0000 (16:51 +0000)]
Merge "ART: Refactor GenerateTestAndBranch"
am:
3ce45f4e6a
* commit '
3ce45f4e6abd725407a539521f69959a6ac5a9c1':
ART: Refactor GenerateTestAndBranch
David Brazdil [Tue, 17 Nov 2015 16:46:49 +0000 (16:46 +0000)]
Merge "ART: Refactor GenerateTestAndBranch"
Richard Uhler [Tue, 17 Nov 2015 16:28:14 +0000 (16:28 +0000)]
Merge "Change roots view to "rooted"." am:
886d1040c9
am:
f9a02c808f
* commit '
f9a02c808f6b88c1eddd5544ae6ae84bb324ee54':
Change roots view to "rooted".
Richard Uhler [Tue, 17 Nov 2015 16:24:22 +0000 (16:24 +0000)]
Merge "Change roots view to "rooted"."
am:
886d1040c9
* commit '
886d1040c99b521ca5a2d363242163c17a5776b1':
Change roots view to "rooted".
Richard Uhler [Tue, 17 Nov 2015 16:21:12 +0000 (16:21 +0000)]
Merge "Change roots view to "rooted"."
David Brazdil [Thu, 12 Nov 2015 18:37:00 +0000 (18:37 +0000)]
ART: Refactor GenerateTestAndBranch
Each code generator implements a method for generating condition
evaluation and branching to arbitrary labels. This patch refactors
it for better clarity but also to generate fewer jumps when the true
branch is the fallthrough successor.
This is preliminary work for implementing HSelect.
Change-Id: Iaa545a5ecbacb761c5aa241fa69140cf6eb5952f
Mingyao Yang [Fri, 31 Jul 2015 23:40:24 +0000 (16:40 -0700)]
Support deoptimization only to set vreg
This CL removes the old API that was used to update vreg. We now rely
exclusively on deoptimization to change the value of a vreg (mainly
from the debugger). This allows to have only one mechanism working
with both Quick and Optimizing compilers. It also remove run-test
455-set-vreg which was the only user of the old API.
This CL also renames StackVisitor::SetVReg[Pair]FromDebugger to
StackVisitor::SetVReg[Pair] to reflect that change.
Bug:
25428216
Change-Id: Ib09510185280dbd0f6d02c52549ae9671c187e32
Sebastien Hertz [Tue, 17 Nov 2015 09:35:39 +0000 (10:35 +0100)]
Fix StackVisitor::GetVReg for reference in shadow frame
Also fixes 457-regs run-test that used to pass an incorrect
vreg kind.
Bug:
25428216
Change-Id: Ic31b51ca0f72350db6325f23087b06e93055d750
Mathieu Chartier [Fri, 13 Nov 2015 18:42:08 +0000 (10:42 -0800)]
Refactor some patching logic
Reduce duplication since app images in-place relocation will require
this code also.
Bug:
22858531
Change-Id: Ibb901b67267e27ef3bc2a0baff77189d4dcd018a
Alex Light [Mon, 16 Nov 2015 18:18:26 +0000 (18:18 +0000)]
Merge "Add ability to skip run-tests with ART_TEST_RUN_TEST_SKIP." am:
991842a527
am:
832a89cd79
* commit '
832a89cd79b57a9f430533af493e6b5ff8642f8b':
Add ability to skip run-tests with ART_TEST_RUN_TEST_SKIP.
Alex Light [Mon, 16 Nov 2015 18:14:17 +0000 (18:14 +0000)]
Merge "Add ability to skip run-tests with ART_TEST_RUN_TEST_SKIP."
am:
991842a527
* commit '
991842a5273d20695dd5f35eb9a9e28c386c5b4b':
Add ability to skip run-tests with ART_TEST_RUN_TEST_SKIP.
Alex Light [Mon, 16 Nov 2015 18:10:37 +0000 (18:10 +0000)]
Merge "Add ability to skip run-tests with ART_TEST_RUN_TEST_SKIP."
Calin Juravle [Mon, 16 Nov 2015 17:09:35 +0000 (17:09 +0000)]
Merge "Ignore NullConstants when computing the type for Phis." am:
a663d67500
am:
043851a8c0
* commit '
043851a8c0f3ffea22cf97f0697df641f74af89e':
Ignore NullConstants when computing the type for Phis.
Calin Juravle [Mon, 16 Nov 2015 17:05:40 +0000 (17:05 +0000)]
Merge "Ignore NullConstants when computing the type for Phis."
am:
a663d67500
* commit '
a663d67500be03df7708afc059f135d2be76ef6e':
Ignore NullConstants when computing the type for Phis.
Calin Juravle [Mon, 16 Nov 2015 17:00:23 +0000 (17:00 +0000)]
Merge "Ignore NullConstants when computing the type for Phis."
Aart Bik [Mon, 16 Nov 2015 16:48:26 +0000 (16:48 +0000)]
Merge "Implemented control of "export only" feature in dexdump." am:
a445f7afbe
am:
9f3d8714d0
* commit '
9f3d8714d04af59f76d2687919c5c4e71823f623':
Implemented control of "export only" feature in dexdump.
Aart Bik [Mon, 16 Nov 2015 16:44:52 +0000 (16:44 +0000)]
Merge "Implemented control of "export only" feature in dexdump."
am:
a445f7afbe
* commit '
a445f7afbe113186de97007891307065109a6b84':
Implemented control of "export only" feature in dexdump.
Aart Bik [Mon, 16 Nov 2015 16:41:21 +0000 (16:41 +0000)]
Merge "Implemented control of "export only" feature in dexdump."
Roland Levillain [Mon, 16 Nov 2015 16:18:20 +0000 (16:18 +0000)]
Merge "Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS." am:
72cc929186
am:
95d1c7b823
* commit '
95d1c7b82394ee8e3891ae58f0020488713668ef':
Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS.
Roland Levillain [Mon, 16 Nov 2015 16:16:09 +0000 (16:16 +0000)]
Merge "Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS."
am:
72cc929186
* commit '
72cc92918665acb262f69e56be984e24bd15a223':
Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS.
Roland Levillain [Mon, 16 Nov 2015 16:09:48 +0000 (16:09 +0000)]
Merge "Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS."
Roland Levillain [Mon, 16 Nov 2015 15:59:08 +0000 (15:59 +0000)]
Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS.
Change-Id: I35caa32c9773646692706642188ab522237a68ac
Roland Levillain [Mon, 16 Nov 2015 15:49:23 +0000 (15:49 +0000)]
Merge "x86/x86-64 read barrier support for concurrent GC in Optimizing." am:
3eb242c0c0
am:
1d8ed62fb4
* commit '
1d8ed62fb423deda86d6745f5a4b03d4bbababe3':
x86/x86-64 read barrier support for concurrent GC in Optimizing.
Roland Levillain [Mon, 16 Nov 2015 15:42:46 +0000 (15:42 +0000)]
Merge "x86/x86-64 read barrier support for concurrent GC in Optimizing."
am:
3eb242c0c0
* commit '
3eb242c0c0d7e8327d2b1f515b463337e37c64ba':
x86/x86-64 read barrier support for concurrent GC in Optimizing.
Roland Levillain [Mon, 16 Nov 2015 15:34:28 +0000 (15:34 +0000)]
Merge "x86/x86-64 read barrier support for concurrent GC in Optimizing."
Calin Juravle [Mon, 16 Nov 2015 11:20:11 +0000 (11:20 +0000)]
Merge "Move the trace file out of the profiles folder." am:
3610abea2f
am:
2dcf91c2b9
* commit '
2dcf91c2b9b43bd435bb2806bb8c324a1040c447':
Move the trace file out of the profiles folder.
Calin Juravle [Mon, 16 Nov 2015 11:12:49 +0000 (11:12 +0000)]
Merge "Move the trace file out of the profiles folder."
am:
3610abea2f
* commit '
3610abea2fe09f519e20fa4212f116d9167b5d51':
Move the trace file out of the profiles folder.
Calin Juravle [Mon, 16 Nov 2015 11:04:13 +0000 (11:04 +0000)]
Merge "Move the trace file out of the profiles folder."
Roland Levillain [Fri, 13 Nov 2015 10:07:31 +0000 (10:07 +0000)]
x86/x86-64 read barrier support for concurrent GC in Optimizing.
This first implementation uses slow paths to instrument heap
reference loads and GC root loads for the concurrent copying
collector, respectively calling the artReadBarrierSlow and
artReadBarrierForRootSlow (new) runtime entry points.
Notes:
- This implementation does not instrument HInvokeVirtual
nor HInvokeInterface instructions (for class reference
loads), as the corresponding read barriers are not stricly
required with the current concurrent copying collector.
- Intrinsics which may eventually call (on slow path) are
disabled when read barriers are enabled, as the current
slow path infrastructure does not support this case.
- When read barriers are enabled, the code generated for a
HArraySet instruction always go into the array set slow
path for object arrays (delegating the operation to the
runtime), as we are lacking a mechanism to keep a
temporary register live accross a runtime call (needed for
the instrumentation of type checking code, which requires
two successive read barriers).
Bug:
12687968
Change-Id: I14cd6107233c326389120336f93955b28ffbb329
Hiroshi Yamauchi [Sat, 14 Nov 2015 02:20:29 +0000 (02:20 +0000)]
Merge "Fix class unloading with the CC collector." am:
dd4cbcc924
am:
d0282856d1
* commit '
d0282856d1fad97009f6a2f870bde25dc0546090':
Fix class unloading with the CC collector.
Hiroshi Yamauchi [Sat, 14 Nov 2015 02:17:42 +0000 (02:17 +0000)]
Merge "Fix class unloading with the CC collector."
am:
dd4cbcc924
* commit '
dd4cbcc924c8ba2a578914a4a366996693bdcd74':
Fix class unloading with the CC collector.
Hiroshi Yamauchi [Sat, 14 Nov 2015 02:15:09 +0000 (02:15 +0000)]
Merge "Fix class unloading with the CC collector."
Alex Light [Fri, 13 Nov 2015 18:51:10 +0000 (10:51 -0800)]
Add ability to skip run-tests with ART_TEST_RUN_TEST_SKIP.
One can skip running specific run-tests under any configuration by
setting the ART_TEST_RUN_TEST_SKIP variable to a list of the run-test
names to skip.
$ # None of the variants of 022-interfaces will be run.
$ ART_TEST_RUN_TEST_SKIP=022-interface mm test-art-host-run-test
Change-Id: I33f24dd7f1eb9f4d6dc407a4abc3c5919437d4fa
Hiroshi Yamauchi [Thu, 12 Nov 2015 07:45:34 +0000 (23:45 -0800)]
Fix class unloading with the CC collector.
Avoid unnecessarily decoding dex cache and class loader weak roots,
which would trigger read barriers.
Re-enable 141-class-unload with the CC collector.
Bug:
12687968
Bug:
24468364
Change-Id: Ib4c19f25000873cab0e06047040442d135285745
Alex Light [Fri, 13 Nov 2015 19:14:02 +0000 (19:14 +0000)]
Merge "Disable test 964 with gcstress since it often times out." am:
0e06a0989f
am:
ba22fb4265
* commit '
ba22fb426513f619893096526827a1e2e461a451':
Disable test 964 with gcstress since it often times out.
Alex Light [Fri, 13 Nov 2015 19:10:26 +0000 (19:10 +0000)]
Merge "Disable test 964 with gcstress since it often times out."
am:
0e06a0989f
* commit '
0e06a0989f4fc53e0d281a5a2cb5b5a17feaea0c':
Disable test 964 with gcstress since it often times out.
Alex Light [Fri, 13 Nov 2015 19:07:37 +0000 (19:07 +0000)]
Merge "Disable test 964 with gcstress since it often times out."
Mathieu Chartier [Fri, 13 Nov 2015 18:43:56 +0000 (18:43 +0000)]
Merge "Revert "Revert "Add missing null check to String::ToCharArray""" am:
f6ebcd099a
am:
d61fabc16c
* commit '
d61fabc16c497241161c2c91868f1b65d9efba6e':
Revert "Revert "Add missing null check to String::ToCharArray""
Mathieu Chartier [Fri, 13 Nov 2015 18:39:46 +0000 (18:39 +0000)]
Merge "Revert "Revert "Add missing null check to String::ToCharArray"""
am:
f6ebcd099a
* commit '
f6ebcd099aeaa694fada7ce4a77b1698488d8121':
Revert "Revert "Add missing null check to String::ToCharArray""
Alex Light [Fri, 13 Nov 2015 18:39:34 +0000 (10:39 -0800)]
Disable test 964 with gcstress since it often times out.
Change-Id: Ice9b25d373b849d4415f9189fe94d8ccd6d05cbe
Ajay Dudani [Thu, 12 Nov 2015 22:28:58 +0000 (14:28 -0800)]
ART: add kryo to a53 #835769 & #843419 erratum exception list
Kryo is custom-designed 64-bit ARM CPU and does not need this A53
erratum handling.
https://www.qualcomm.com/news/snapdragon/2015/09/02/snapdragon-820-and-kryo-cpu-heterogeneous-computing-and-role-custom
Change-Id: Id8f6c616ab2ed19056fd1e3829b85b94a6e6eb84
Mathieu Chartier [Fri, 13 Nov 2015 18:33:54 +0000 (18:33 +0000)]
Merge "Revert "Revert "Add missing null check to String::ToCharArray"""
Aart Bik [Fri, 13 Nov 2015 18:06:01 +0000 (10:06 -0800)]
Implemented control of "export only" feature in dexdump.
Rationale:
Export only is now under explicit control of a new -e flag, and
can be used to control both -l xml and -l plain. The result is
that, by default, xml output now shows all items (old behavior
can be forced with -e -l xml). This solution feels a bit cleaner
than adding a flag to override export only when -l xml is given
(old dexdump forced this tight relation).
Bug:
25673756 (feature request).
Change-Id: I7cfd48bf91195d2a81d134936719d267fda399f5
Mathieu Chartier [Fri, 13 Nov 2015 16:36:59 +0000 (08:36 -0800)]
Revert "Revert "Add missing null check to String::ToCharArray""
Fix flaky test.
Bug:
25641543
This reverts commit
b52a39c76e0cb0638c92cdcf6b5c5aa551420e1a.
Change-Id: I6b0d3087dba3680252e65af554530e2769cde55c
David Srbecky [Fri, 13 Nov 2015 15:59:13 +0000 (15:59 +0000)]
Merge "Stream DWARF debug section directly to disk." am:
2f49b0a907
am:
dd3b7eff27
* commit '
dd3b7eff276076574c51ebd9df3f1bbed4442b4b':
Stream DWARF debug section directly to disk.
David Srbecky [Fri, 13 Nov 2015 15:56:39 +0000 (15:56 +0000)]
Merge "Stream DWARF debug section directly to disk."
am:
2f49b0a907
* commit '
2f49b0a90720fe9f4cab040c376aab5f387967e3':
Stream DWARF debug section directly to disk.
David Srbecky [Fri, 13 Nov 2015 15:53:30 +0000 (15:53 +0000)]
Merge "Stream DWARF debug section directly to disk."
Nicolas Geoffray [Fri, 13 Nov 2015 08:22:32 +0000 (08:22 +0000)]
Merge "Revert "Add missing null check to String::ToCharArray"" am:
6aa0735c7b
am:
59a32943da
* commit '
59a32943da3eeb76968f7d6817b031f95a7dc6a3':
Revert "Add missing null check to String::ToCharArray"
Nicolas Geoffray [Fri, 13 Nov 2015 08:20:00 +0000 (08:20 +0000)]
Merge "Revert "Add missing null check to String::ToCharArray""
am:
6aa0735c7b
* commit '
6aa0735c7b84061901a844270d22249cbb01004e':
Revert "Add missing null check to String::ToCharArray"
Nicolas Geoffray [Fri, 13 Nov 2015 08:16:55 +0000 (08:16 +0000)]
Merge "Revert "Add missing null check to String::ToCharArray""
Nicolas Geoffray [Fri, 13 Nov 2015 08:16:23 +0000 (08:16 +0000)]
Revert "Add missing null check to String::ToCharArray"
Does not work with the interpreter.
Bug:
25641543
This reverts commit
952d608062eec2d7f47f9b45dba935ad8b4d23e5.
Change-Id: Ic112fa69c7ddd119cbccc5b65007b5ee4dfccd09
Mathieu Chartier [Fri, 13 Nov 2015 01:37:44 +0000 (01:37 +0000)]
Merge "Add missing null check to String::ToCharArray" am:
dc9706dcea
am:
8cbe8c1800
* commit '
8cbe8c1800f95b539d002d1810ba610bd05c4819':
Add missing null check to String::ToCharArray
Mathieu Chartier [Fri, 13 Nov 2015 01:34:55 +0000 (01:34 +0000)]
Merge "Add missing null check to String::ToCharArray"
am:
dc9706dcea
* commit '
dc9706dcea7c1384d2b2137485f9579db36ca328':
Add missing null check to String::ToCharArray
Mathieu Chartier [Fri, 13 Nov 2015 01:32:44 +0000 (01:32 +0000)]
Merge "Add missing null check to String::ToCharArray"
Mathieu Chartier [Fri, 13 Nov 2015 00:53:41 +0000 (16:53 -0800)]
Add missing null check to String::ToCharArray
Added test.
Bug:
25641543
Change-Id: Ic9a21ce8bc530dbedf14334ad47f5faa90ae4ddc
Alex Light [Fri, 13 Nov 2015 00:58:28 +0000 (00:58 +0000)]
Merge "Fix bug with test 964." am:
1227d627e0
am:
292c532b78
* commit '
292c532b78c073fa696a29efe01490bd3b06ad41':
Fix bug with test 964.
Alex Light [Fri, 13 Nov 2015 00:55:39 +0000 (00:55 +0000)]
Merge "Fix bug with test 964."
am:
1227d627e0
* commit '
1227d627e0e0ef8b34a66f94714ed737953098ce':
Fix bug with test 964.