OSDN Git Service

android-x86/art.git
8 years agoMerge "Support deoptimization only to set vreg" am: a7a3ba792d
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

8 years agoMerge "Support deoptimization only to set vreg"
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

8 years agoMerge "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"

8 years agoMerge "Fix StackVisitor::GetVReg for reference in shadow frame" am: 3e1ff83fb2
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoMerge "RosAlloc fast path inline in assembly for x86 32bit." am: cb6638ff66
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMerge "Refactor some patching logic" am: ed42f392f9
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

8 years agoMerge "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

8 years agoMerge "Refactor some patching logic"
Mathieu Chartier [Tue, 17 Nov 2015 20:10:24 +0000 (20:10 +0000)]
Merge "Refactor some patching logic"

8 years agoMerge "Minor fixes and cleaning of arm64 static and direct calls code." am: a04f57badc
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.

8 years agoMerge "ART: add kryo to a53 #835769 & #843419 erratum exception list" am: 9013bb031c
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

8 years agoMerge "Minor fixes and cleaning of arm64 static and direct calls code."
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.

8 years agoMerge "ART: add kryo to a53 #835769 & #843419 erratum exception list"
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

8 years agoMerge "Minor fixes and cleaning of arm64 static and direct calls code."
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."

8 years agoMerge "ART: add kryo to a53 #835769 & #843419 erratum exception list"
Vladimir Marko [Tue, 17 Nov 2015 17:40:34 +0000 (17:40 +0000)]
Merge "ART: add kryo to a53 #835769 & #843419 erratum exception list"

8 years agoMerge "ART: Refactor GenerateTestAndBranch" am: 3ce45f4e6a
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

8 years agoMerge "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

8 years agoMerge "ART: Refactor GenerateTestAndBranch"
David Brazdil [Tue, 17 Nov 2015 16:46:49 +0000 (16:46 +0000)]
Merge "ART: Refactor GenerateTestAndBranch"

8 years agoMerge "Change roots view to "rooted"." am: 886d1040c9
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".

8 years agoMerge "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".

8 years agoMerge "Change roots view to "rooted"."
Richard Uhler [Tue, 17 Nov 2015 16:21:12 +0000 (16:21 +0000)]
Merge "Change roots view to "rooted"."

8 years agoART: Refactor GenerateTestAndBranch
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

8 years agoSupport deoptimization only to set vreg
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

8 years agoFix StackVisitor::GetVReg for reference in shadow frame
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

8 years agoRefactor some patching logic
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

8 years agoMerge "Add ability to skip run-tests with ART_TEST_RUN_TEST_SKIP." am: 991842a527
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMerge "Ignore NullConstants when computing the type for Phis." am: a663d67500
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMerge "Implemented control of "export only" feature in dexdump." am: a445f7afbe
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMerge "Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS." am: 72cc929186
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMark 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

8 years agoMerge "x86/x86-64 read barrier support for concurrent GC in Optimizing." am: 3eb242c0c0
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMerge "Move the trace file out of the profiles folder." am: 3610abea2f
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agox86/x86-64 read barrier support for concurrent GC in Optimizing.
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

8 years agoMerge "Fix class unloading with the CC collector." am: dd4cbcc924
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoAdd ability to skip run-tests with ART_TEST_RUN_TEST_SKIP.
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

8 years agoFix class unloading with the CC collector.
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

8 years agoMerge "Disable test 964 with gcstress since it often times out." am: 0e06a0989f
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMerge "Revert "Revert "Add missing null check to String::ToCharArray""" am: f6ebcd099a
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""

8 years agoMerge "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""

8 years agoDisable test 964 with gcstress since it often times out.
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

8 years agoART: add kryo to a53 #835769 & #843419 erratum exception list
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

8 years agoMerge "Revert "Revert "Add missing null check to String::ToCharArray"""
Mathieu Chartier [Fri, 13 Nov 2015 18:33:54 +0000 (18:33 +0000)]
Merge "Revert "Revert "Add missing null check to String::ToCharArray"""

8 years agoImplemented control of "export only" feature in dexdump.
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

8 years agoRevert "Revert "Add missing null check to String::ToCharArray""
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

8 years agoMerge "Stream DWARF debug section directly to disk." am: 2f49b0a907
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMerge "Revert "Add missing null check to String::ToCharArray"" am: 6aa0735c7b
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"

8 years agoMerge "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"

8 years agoMerge "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""

8 years agoRevert "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

8 years agoMerge "Add missing null check to String::ToCharArray" am: dc9706dcea
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoAdd 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

8 years agoMerge "Fix bug with test 964." am: 1227d627e0
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.

8 years agoMerge "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.

8 years agoMerge "Fix bug with test 964."
Alex Light [Fri, 13 Nov 2015 00:50:11 +0000 (00:50 +0000)]
Merge "Fix bug with test 964."

8 years agoFix bug with test 964.
Alex Light [Thu, 12 Nov 2015 23:38:24 +0000 (15:38 -0800)]
Fix bug with test 964.

An indentation error meant that some test cases would not be
generated. Also fixed run-test script since fixing this causes the
output to be larger than the default ulimit.

Change-Id: I454f89078f8307f400b66627fdab13feaf492512

8 years agoMerge "Add class loader argument to openDexFileNative" am: efca362e8c
Mathieu Chartier [Thu, 12 Nov 2015 19:29:04 +0000 (19:29 +0000)]
Merge "Add class loader argument to openDexFileNative" am: efca362e8c
am: bb66d10578

* commit 'bb66d10578f1bfc1de1a60f856181acf9806af07':
  Add class loader argument to openDexFileNative

8 years agoMerge "Add class loader argument to openDexFileNative"
Mathieu Chartier [Thu, 12 Nov 2015 19:25:25 +0000 (19:25 +0000)]
Merge "Add class loader argument to openDexFileNative"
am: efca362e8c

* commit 'efca362e8c67d5b330dd4ebc312cd45cf2585964':
  Add class loader argument to openDexFileNative

8 years agoMerge "Add class loader argument to openDexFileNative"
Mathieu Chartier [Thu, 12 Nov 2015 19:19:36 +0000 (19:19 +0000)]
Merge "Add class loader argument to openDexFileNative"

8 years agoAdd class loader argument to openDexFileNative
Mathieu Chartier [Thu, 12 Nov 2015 18:00:58 +0000 (10:00 -0800)]
Add class loader argument to openDexFileNative

Bug: 22858531
Change-Id: I315919d91822db0c73cf16b21d660d5870d5746f

8 years agoMinor fixes and cleaning of arm64 static and direct calls code.
Alexandre Rames [Thu, 12 Nov 2015 14:44:19 +0000 (14:44 +0000)]
Minor fixes and cleaning of arm64 static and direct calls code.

Fixes:
The proper way to avoid the MacroAssembler to generate code before or
after an instruction is to block the pools (usually via
`vixl::BlockPoolsScope`). Here we can use
`vixl::SingleEmissionCheckScope`, that checks we generate only one
instruction and also blocks the pools.
In practice the current code would have worked fine because VIXL would
not have generated anything after `Bl()` or `Ldr()`, but that was not
guaranteed.

Cleaning:
- `XRegisterFrom()` returns an X register. Calling `.X()` is not
  required.
- Since we are sure (after the previous fixes) that nothing will be
  emitted around the instructions we care about, update the code to
  bind labels before the instructions for simplicity.

Change-Id: I42d49976721e380e66bcd7a5b345f1777009434a

8 years agoMerge "Optimizing/X86: PC-relative dex cache array addressing." am: cff81076cb
Vladimir Marko [Thu, 12 Nov 2015 15:25:25 +0000 (15:25 +0000)]
Merge "Optimizing/X86: PC-relative dex cache array addressing." am: cff81076cb
am: 29263cb5ce

* commit '29263cb5ce9413623d0eb96703b687d9d7785640':
  Optimizing/X86: PC-relative dex cache array addressing.

8 years agoMerge "Optimizing/X86: PC-relative dex cache array addressing."
Vladimir Marko [Thu, 12 Nov 2015 15:22:51 +0000 (15:22 +0000)]
Merge "Optimizing/X86: PC-relative dex cache array addressing."
am: cff81076cb

* commit 'cff81076cbb4bbe3841942f14326f4401fa3c8df':
  Optimizing/X86: PC-relative dex cache array addressing.

8 years agoMerge "Optimizing/X86: PC-relative dex cache array addressing."
Vladimir Marko [Thu, 12 Nov 2015 15:20:08 +0000 (15:20 +0000)]
Merge "Optimizing/X86: PC-relative dex cache array addressing."

8 years agoMerge "Optimizing: Clean up constant location handling." am: fe0ec35c68
Vladimir Marko [Thu, 12 Nov 2015 12:01:58 +0000 (12:01 +0000)]
Merge "Optimizing: Clean up constant location handling." am: fe0ec35c68
am: c080a0964f

* commit 'c080a0964f78da2430604ddcbdf88cc182bedd74':
  Optimizing: Clean up constant location handling.

8 years agoMerge "Optimizing: Clean up constant location handling."
Vladimir Marko [Thu, 12 Nov 2015 11:59:06 +0000 (11:59 +0000)]
Merge "Optimizing: Clean up constant location handling."
am: fe0ec35c68

* commit 'fe0ec35c68d57205bd8fe13bd195ae0b5a3ed180':
  Optimizing: Clean up constant location handling.

8 years agoMerge "Optimizing: Clean up constant location handling."
Vladimir Marko [Thu, 12 Nov 2015 11:56:22 +0000 (11:56 +0000)]
Merge "Optimizing: Clean up constant location handling."

8 years agoMerge "Revert "Mark __jit_debug_register_code as a unique symbol"" am: 7a2f5c9459
Tamas Berghammer [Thu, 12 Nov 2015 11:13:32 +0000 (11:13 +0000)]
Merge "Revert "Mark __jit_debug_register_code as a unique symbol"" am: 7a2f5c9459
am: 66914f11b9

* commit '66914f11b9719f4e63bd80482fd4cf0c2a5acc0d':
  Revert "Mark __jit_debug_register_code as a unique symbol"

8 years agoMerge "Revert "Mark __jit_debug_register_code as a unique symbol""
Tamas Berghammer [Thu, 12 Nov 2015 11:10:48 +0000 (11:10 +0000)]
Merge "Revert "Mark __jit_debug_register_code as a unique symbol""
am: 7a2f5c9459

* commit '7a2f5c9459b492bd8550e437087191e52ca6324f':
  Revert "Mark __jit_debug_register_code as a unique symbol"

8 years agoMerge "Revert "Mark __jit_debug_register_code as a unique symbol""
Tamas Berghammer [Thu, 12 Nov 2015 11:06:38 +0000 (11:06 +0000)]
Merge "Revert "Mark __jit_debug_register_code as a unique symbol""

8 years agoRevert "Mark __jit_debug_register_code as a unique symbol"
Tamas Berghammer [Thu, 12 Nov 2015 11:05:50 +0000 (11:05 +0000)]
Revert "Mark __jit_debug_register_code as a unique symbol"

This reverts commit e7132a9a5d98103fa52a750287476b063fa88863.

We are still using ld on some targets instead of gold when compiling for ararch64. Revert until we figure out why.

Change-Id: If09fac8d72485dc8adbc81e44a2af84ed91dcd91

8 years agoMerge "JDWP: default implementation of Method.IsObsolete" am: 190c5f9f3b
Sebastien Hertz [Thu, 12 Nov 2015 11:05:24 +0000 (11:05 +0000)]
Merge "JDWP: default implementation of Method.IsObsolete" am: 190c5f9f3b
am: ead379aa71

* commit 'ead379aa712ac1a9e91d55effe95e01834489299':
  JDWP: default implementation of Method.IsObsolete

8 years agoMerge "JDWP: default implementation of Method.IsObsolete"
Sebastien Hertz [Thu, 12 Nov 2015 11:02:35 +0000 (11:02 +0000)]
Merge "JDWP: default implementation of Method.IsObsolete"
am: 190c5f9f3b

* commit '190c5f9f3b8aba5c8c7a26d4cfe0f45297bd875c':
  JDWP: default implementation of Method.IsObsolete

8 years agoMerge "JDWP: default implementation of Method.IsObsolete"
Sebastien Hertz [Thu, 12 Nov 2015 11:00:38 +0000 (11:00 +0000)]
Merge "JDWP: default implementation of Method.IsObsolete"

8 years agoMerge "MIPS64: fix calling conventions in LoadClass and field accesses" am: e542fd0c04
Roland Levillain [Thu, 12 Nov 2015 10:51:36 +0000 (10:51 +0000)]
Merge "MIPS64: fix calling conventions in LoadClass and field accesses" am: e542fd0c04
am: f461a1703d

* commit 'f461a1703da9247a1d58a2c80e5167f6176f1bcc':
  MIPS64: fix calling conventions in LoadClass and field accesses

8 years agoMerge "MIPS64: fix calling conventions in LoadClass and field accesses"
Roland Levillain [Thu, 12 Nov 2015 10:47:58 +0000 (10:47 +0000)]
Merge "MIPS64: fix calling conventions in LoadClass and field accesses"
am: e542fd0c04

* commit 'e542fd0c04426c45ae6a04bc4ae79ac77b99d8c6':
  MIPS64: fix calling conventions in LoadClass and field accesses

8 years agoMerge "Mark __jit_debug_register_code as a unique symbol" am: 772e3ab102
Tamas Berghammer [Thu, 12 Nov 2015 10:45:21 +0000 (10:45 +0000)]
Merge "Mark __jit_debug_register_code as a unique symbol" am: 772e3ab102
am: 191876fd12

* commit '191876fd12ff0986c84931d2664041ab9143726b':
  Mark __jit_debug_register_code as a unique symbol

8 years agoOptimizing/X86: PC-relative dex cache array addressing.
Vladimir Marko [Mon, 2 Nov 2015 14:36:43 +0000 (14:36 +0000)]
Optimizing/X86: PC-relative dex cache array addressing.

Add PC-relative dex cache array addressing for X86 and use
it for better invoke-static/-direct dispatch. Also delay
the initialization to the PC-relative base until needed.

Change-Id: Ib8634d5edce4920cd70172fd13211809cf6948d1