OSDN Git Service

android-x86/art.git
9 years agoam c957bb09: am cb5dc7f4: Merge "ART: Allow PackedSwitch instructions with zero targets"
David Brazdil [Wed, 17 Jun 2015 16:54:28 +0000 (16:54 +0000)]
am c957bb09: am cb5dc7f4: Merge "ART: Allow PackedSwitch instructions with zero targets"

* commit 'c957bb09f6555be3c64704ac6f0a3fb6d802ae74':
  ART: Allow PackedSwitch instructions with zero targets

9 years agoam cb5dc7f4: Merge "ART: Allow PackedSwitch instructions with zero targets"
David Brazdil [Wed, 17 Jun 2015 16:41:15 +0000 (16:41 +0000)]
am cb5dc7f4: Merge "ART: Allow PackedSwitch instructions with zero targets"

* commit 'cb5dc7f4b795c3ef7ec48989542efdbe44898b94':
  ART: Allow PackedSwitch instructions with zero targets

9 years agoam afe9e134: Set default visibility on art_sigsegv_fault.
Oleksiy Vyalov [Wed, 17 Jun 2015 16:36:08 +0000 (16:36 +0000)]
am afe9e134: Set default visibility on art_sigsegv_fault.

* commit 'afe9e134a773242b142b0740383f085f08ec1cba':
  Set default visibility on art_sigsegv_fault.

9 years agoMerge "ART: Allow PackedSwitch instructions with zero targets"
David Brazdil [Wed, 17 Jun 2015 16:32:51 +0000 (16:32 +0000)]
Merge "ART: Allow PackedSwitch instructions with zero targets"

9 years agoART: Allow PackedSwitch instructions with zero targets
David Brazdil [Wed, 17 Jun 2015 14:38:35 +0000 (15:38 +0100)]
ART: Allow PackedSwitch instructions with zero targets

Optimizing's Builder wrongly assumed that a PackedSwitch always has
at least one target. This patch removes the corresponding DCHECK and
adds a regression test case.

Bug:21863783
Change-Id: I32b7033ed38de6f1d1a6ee5d5bf12f3a47c9b37e

9 years agoSet default visibility on art_sigsegv_fault.
Oleksiy Vyalov [Sun, 14 Jun 2015 22:17:26 +0000 (15:17 -0700)]
Set default visibility on art_sigsegv_fault.

libart.so is built with flag -fvisibility=protected
which complicates setting breakpoints on art_sigsegv_fault.
According to the GCC manual "Protected visibility indicates
that the symbol will be placed in the dynamic symbol table,
but that references within the defining module will bind
to the local symbol.". This implies that a breakpoint on
a protected symbol will not be hit.

Without this change gdbclient with ART debugging enabled
doesn't break at art_sigsegv_fault as expected.

Bonus build fix included (commit c37769b6) :

Fix lint error.

Blank line at the start of a code block.

(cherry picked from commit f775bab533cd385c00ee30b56bdcb6f962fc5239)
(cherry picked from commit c37769b63faf7b120a6ed80f5cfb92667f5090c4)

bug: 21893559

Change-Id: Ie388f027f717a7bd2351a0163a38e50d3acbba8f

9 years agoam 98c8ade0: am edb83c60: Merge "Fix bug in optimizing around instanceof."
Nicolas Geoffray [Wed, 17 Jun 2015 11:09:55 +0000 (11:09 +0000)]
am 98c8ade0: am edb83c60: Merge "Fix bug in optimizing around instanceof."

* commit '98c8ade02a02743b01a93942504051ce3246db94':
  Fix bug in optimizing around instanceof.

9 years agoam edb83c60: Merge "Fix bug in optimizing around instanceof."
Nicolas Geoffray [Wed, 17 Jun 2015 10:58:59 +0000 (10:58 +0000)]
am edb83c60: Merge "Fix bug in optimizing around instanceof."

* commit 'edb83c606e034d76bed1331f34cdc435df47bb95':
  Fix bug in optimizing around instanceof.

9 years agoMerge "Fix bug in optimizing around instanceof."
Nicolas Geoffray [Wed, 17 Jun 2015 10:50:00 +0000 (10:50 +0000)]
Merge "Fix bug in optimizing around instanceof."

9 years agoFix bug in optimizing around instanceof.
Nicolas Geoffray [Wed, 17 Jun 2015 10:35:11 +0000 (11:35 +0100)]
Fix bug in optimizing around instanceof.

We were too aggressive when removing instanceof. We should
not remove it when there is one of the two static types that
is an interface.

Change-Id: I1fd80915b99b094f7b4393e7adb2b160201b30d5

9 years agoam 29518ae1: am 4b9a93e7: Merge "Remove bogus DCHECK in BCE."
Nicolas Geoffray [Wed, 17 Jun 2015 10:01:54 +0000 (10:01 +0000)]
am 29518ae1: am 4b9a93e7: Merge "Remove bogus DCHECK in BCE."

* commit '29518ae102dd8438c5920f6757014d032f6cba97':
  Remove bogus DCHECK in BCE.

9 years agoam f3c1e0d9: am 445e3502: Merge "More stack map dumping."
Nicolas Geoffray [Wed, 17 Jun 2015 10:01:52 +0000 (10:01 +0000)]
am f3c1e0d9: am 445e3502: Merge "More stack map dumping."

* commit 'f3c1e0d98b90a90281d5196b1efc5cf494e834b2':
  More stack map dumping.

9 years agoam 4f579be1: am a2890553: Merge "Fix lint error."
Narayan Kamath [Wed, 17 Jun 2015 10:01:51 +0000 (10:01 +0000)]
am 4f579be1: am a2890553: Merge "Fix lint error."

* commit '4f579be197e9841e5c71cc28823c8056789fa8fc':
  Fix lint error.

9 years agoam 419357d8: am 233cf0e8: Merge "Exercise sun.misc.Unsafe.getObject."
Roland Levillain [Wed, 17 Jun 2015 10:01:50 +0000 (10:01 +0000)]
am 419357d8: am 233cf0e8: Merge "Exercise sun.misc.Unsafe.getObject."

* commit '419357d89f948aeae875d569c9a312e7d3571415':
  Exercise sun.misc.Unsafe.getObject.

9 years agoam 17ab6767: am 088bd0d2: Merge "Revert "Revert "ART: Implement literal pool for...
Vladimir Marko [Wed, 17 Jun 2015 10:01:48 +0000 (10:01 +0000)]
am 17ab6767: am 088bd0d2: Merge "Revert "Revert "ART: Implement literal pool for arm, fix branch fixup."""

* commit '17ab67676c951cfd5eca61d7f6d2eb20d40f7d54':
  Revert "Revert "ART: Implement literal pool for arm, fix branch fixup.""

9 years agoam fc4e395a: am b3daa231: Merge "Set default visibility on art_sigsegv_fault."
Narayan Kamath [Wed, 17 Jun 2015 10:01:47 +0000 (10:01 +0000)]
am fc4e395a: am b3daa231: Merge "Set default visibility on art_sigsegv_fault."

* commit 'fc4e395af2c41862d1519b74ec818cdb52b04691':
  Set default visibility on art_sigsegv_fault.

9 years agoam d56dd524: am ed44919d: Merge "CFI test: kill the other process in native code."
Nicolas Geoffray [Wed, 17 Jun 2015 10:01:46 +0000 (10:01 +0000)]
am d56dd524: am ed44919d: Merge "CFI test: kill the other process in native code."

* commit 'd56dd5248cbd0d520dfd2ae3dc1c712d3e91b28d':
  CFI test: kill the other process in native code.

9 years agoam 4b9a93e7: Merge "Remove bogus DCHECK in BCE."
Nicolas Geoffray [Wed, 17 Jun 2015 09:48:48 +0000 (09:48 +0000)]
am 4b9a93e7: Merge "Remove bogus DCHECK in BCE."

* commit '4b9a93e7774d6650f6f3b637d018109d6fe97546':
  Remove bogus DCHECK in BCE.

9 years agoam 445e3502: Merge "More stack map dumping."
Nicolas Geoffray [Wed, 17 Jun 2015 09:48:47 +0000 (09:48 +0000)]
am 445e3502: Merge "More stack map dumping."

* commit '445e35028bc5cb6d921dc60e579b7b40ceb16c71':
  More stack map dumping.

9 years agoam a2890553: Merge "Fix lint error."
Narayan Kamath [Wed, 17 Jun 2015 09:48:45 +0000 (09:48 +0000)]
am a2890553: Merge "Fix lint error."

* commit 'a28905535905ed2b86de6f621991b8775beb493e':
  Fix lint error.

9 years agoam 233cf0e8: Merge "Exercise sun.misc.Unsafe.getObject."
Roland Levillain [Wed, 17 Jun 2015 09:48:44 +0000 (09:48 +0000)]
am 233cf0e8: Merge "Exercise sun.misc.Unsafe.getObject."

* commit '233cf0e8584225f1f7d21d4999cda18c23469d59':
  Exercise sun.misc.Unsafe.getObject.

9 years agoam 088bd0d2: Merge "Revert "Revert "ART: Implement literal pool for arm, fix branch...
Vladimir Marko [Wed, 17 Jun 2015 09:48:42 +0000 (09:48 +0000)]
am 088bd0d2: Merge "Revert "Revert "ART: Implement literal pool for arm, fix branch fixup."""

* commit '088bd0d28acb70302d20f6e19a9db7f0536c09ee':
  Revert "Revert "ART: Implement literal pool for arm, fix branch fixup.""

9 years agoam b3daa231: Merge "Set default visibility on art_sigsegv_fault."
Narayan Kamath [Wed, 17 Jun 2015 09:48:41 +0000 (09:48 +0000)]
am b3daa231: Merge "Set default visibility on art_sigsegv_fault."

* commit 'b3daa2312747eaf852c948c189ca0745db116447':
  Set default visibility on art_sigsegv_fault.

9 years agoam ed44919d: Merge "CFI test: kill the other process in native code."
Nicolas Geoffray [Wed, 17 Jun 2015 09:48:39 +0000 (09:48 +0000)]
am ed44919d: Merge "CFI test: kill the other process in native code."

* commit 'ed44919da8f7ab96117fd9d30b3fbfcd88f1433c':
  CFI test: kill the other process in native code.

9 years agoMerge "Remove bogus DCHECK in BCE."
Nicolas Geoffray [Wed, 17 Jun 2015 09:44:18 +0000 (09:44 +0000)]
Merge "Remove bogus DCHECK in BCE."

9 years agoRemove bogus DCHECK in BCE.
Nicolas Geoffray [Wed, 17 Jun 2015 09:17:49 +0000 (10:17 +0100)]
Remove bogus DCHECK in BCE.

When creating a phi for the array length when we add HDeoptimization
nodes, we might update accesses in inner loops to use that phi instead
of the array length. The BCE phase was not expecting this case.

Change-Id: I639f4ea6f5889726142041a42736183f162c7437

9 years agoMerge "More stack map dumping."
Nicolas Geoffray [Wed, 17 Jun 2015 09:19:09 +0000 (09:19 +0000)]
Merge "More stack map dumping."

9 years agoMore stack map dumping.
Nicolas Geoffray [Wed, 17 Jun 2015 08:44:43 +0000 (09:44 +0100)]
More stack map dumping.

Change-Id: I1f734c0c9eabda1cc6adaf32579e4c3be4a45c9a

9 years agoMerge "Fix lint error."
Narayan Kamath [Wed, 17 Jun 2015 08:57:36 +0000 (08:57 +0000)]
Merge "Fix lint error."

9 years agoMerge "Exercise sun.misc.Unsafe.getObject."
Roland Levillain [Wed, 17 Jun 2015 08:56:12 +0000 (08:56 +0000)]
Merge "Exercise sun.misc.Unsafe.getObject."

9 years agoFix lint error.
Narayan Kamath [Wed, 17 Jun 2015 08:49:40 +0000 (09:49 +0100)]
Fix lint error.

Blank line at the start of a code block.

Change-Id: Ifc0d78acc8b2eecbdc1a340009757f9218ce2c5c

9 years agoMerge "Revert "Revert "ART: Implement literal pool for arm, fix branch fixup."""
Vladimir Marko [Wed, 17 Jun 2015 08:45:51 +0000 (08:45 +0000)]
Merge "Revert "Revert "ART: Implement literal pool for arm, fix branch fixup."""

9 years agoRevert "Revert "ART: Implement literal pool for arm, fix branch fixup.""
Vladimir Marko [Tue, 16 Jun 2015 11:33:24 +0000 (11:33 +0000)]
Revert "Revert "ART: Implement literal pool for arm, fix branch fixup.""

This reverts commit fbeb4aede0ddc5b1e6a5a3a40cc6266fe8518c98.

Adjust block label positions. Bad catch block labels were the
reason for the revert.

Change-Id: Ia6950d639d46b9da6b07f3ade63ab46d03d63310

9 years agoMerge "Set default visibility on art_sigsegv_fault."
Narayan Kamath [Wed, 17 Jun 2015 08:34:57 +0000 (08:34 +0000)]
Merge "Set default visibility on art_sigsegv_fault."

9 years agoSet default visibility on art_sigsegv_fault.
Oleksiy Vyalov [Sun, 14 Jun 2015 22:17:26 +0000 (15:17 -0700)]
Set default visibility on art_sigsegv_fault.

libart.so is built with flag -fvisibility=protected
which complicates setting breakpoints on art_sigsegv_fault.
According to the GCC manual "Protected visibility indicates
that the symbol will be placed in the dynamic symbol table,
but that references within the defining module will bind
to the local symbol.". This implies that a breakpoint on
a protected symbol will not be hit.

Without this change gdbclient with ART debugging enabled
doesn't break at art_sigsegv_fault as expected.

Change-Id: Ib73344e710966eddf55a6facb29558504a511f00

9 years agoMerge "CFI test: kill the other process in native code."
Nicolas Geoffray [Wed, 17 Jun 2015 08:08:48 +0000 (08:08 +0000)]
Merge "CFI test: kill the other process in native code."

9 years agoCFI test: kill the other process in native code.
David Srbecky [Wed, 17 Jun 2015 02:52:54 +0000 (03:52 +0100)]
CFI test: kill the other process in native code.

Killing it from Java does not seem reliable and the CFI
test tends to leave alive processes on the system.
This might be particularly troubling on the build bot.

Change-Id: I888b61037ab77fb4ff929762ea40af53f7a6ed6e

9 years agoam 1070c1ce: am b3e3000a: Merge "Find the dlopened file using address rather than...
David Srbecky [Wed, 17 Jun 2015 02:17:56 +0000 (02:17 +0000)]
am 1070c1ce: am b3e3000a: Merge "Find the dlopened file using address rather than file path."

* commit '1070c1ce23448fab59e326368bacbb13d54288c6':
  Find the dlopened file using address rather than file path.

9 years agoam b3e3000a: Merge "Find the dlopened file using address rather than file path."
David Srbecky [Wed, 17 Jun 2015 02:03:54 +0000 (02:03 +0000)]
am b3e3000a: Merge "Find the dlopened file using address rather than file path."

* commit 'b3e3000a59a3b0d765840bd1a939213a2b400763':
  Find the dlopened file using address rather than file path.

9 years agoMerge "Find the dlopened file using address rather than file path."
David Srbecky [Wed, 17 Jun 2015 01:56:52 +0000 (01:56 +0000)]
Merge "Find the dlopened file using address rather than file path."

9 years agoFind the dlopened file using address rather than file path.
David Srbecky [Wed, 17 Jun 2015 01:11:07 +0000 (02:11 +0100)]
Find the dlopened file using address rather than file path.

This should fix the build bot.  It was failing because the
path which we pass to dlopen is not the path that gets mmaped.

Bug: 21854739
Change-Id: I0c28c74b62743f74f9ff3ae89e6f1beb0c1113ae

9 years agoam fd1c3574: am 89c63739: Merge "Add more logging output for dlopen."
David Srbecky [Tue, 16 Jun 2015 23:47:36 +0000 (23:47 +0000)]
am fd1c3574: am 89c63739: Merge "Add more logging output for dlopen."

* commit 'fd1c357462d3decb4bb50ebc6ccb26b6ce7a17f2':
  Add more logging output for dlopen.

9 years agoam 3c9229d7: am 86b35f97: Merge "Revert "Revert "Use dlopen to load oat files."""
David Srbecky [Tue, 16 Jun 2015 23:47:35 +0000 (23:47 +0000)]
am 3c9229d7: am 86b35f97: Merge "Revert "Revert "Use dlopen to load oat files."""

* commit '3c9229d767191c19d4e16c2354996591f6b74fcd':
  Revert "Revert "Use dlopen to load oat files.""

9 years agoam 89c63739: Merge "Add more logging output for dlopen."
David Srbecky [Tue, 16 Jun 2015 23:32:50 +0000 (23:32 +0000)]
am 89c63739: Merge "Add more logging output for dlopen."

* commit '89c63739e280ab94399d263624558e1d99fb5af7':
  Add more logging output for dlopen.

9 years agoam 86b35f97: Merge "Revert "Revert "Use dlopen to load oat files."""
David Srbecky [Tue, 16 Jun 2015 23:32:48 +0000 (23:32 +0000)]
am 86b35f97: Merge "Revert "Revert "Use dlopen to load oat files."""

* commit '86b35f97ce1848608e70eb1f0ea9f73d25b80d09':
  Revert "Revert "Use dlopen to load oat files.""

9 years agoMerge "Add more logging output for dlopen."
David Srbecky [Tue, 16 Jun 2015 23:20:40 +0000 (23:20 +0000)]
Merge "Add more logging output for dlopen."

9 years agoMerge "Revert "Revert "Use dlopen to load oat files."""
David Srbecky [Tue, 16 Jun 2015 23:20:08 +0000 (23:20 +0000)]
Merge "Revert "Revert "Use dlopen to load oat files."""

9 years agoAdd more logging output for dlopen.
David Srbecky [Tue, 16 Jun 2015 23:08:02 +0000 (00:08 +0100)]
Add more logging output for dlopen.

Investigation of build bot failure which I can not reproduce locally.

Bug: 21854739
Change-Id: I4584bb10ad44e4bcf8232c060e40b36ff924ffa2

9 years agoam 4eacb2bd: am 7e7e69a0: Merge "Print more diagnosis info on to-space invariant...
Hiroshi Yamauchi [Tue, 16 Jun 2015 19:45:26 +0000 (19:45 +0000)]
am 4eacb2bd: am 7e7e69a0: Merge "Print more diagnosis info on to-space invariant violation."

* commit '4eacb2bda0d0d6708cb7f8e64b91ae9511cd41c5':
  Print more diagnosis info on to-space invariant violation.

9 years agoam 7e7e69a0: Merge "Print more diagnosis info on to-space invariant violation."
Hiroshi Yamauchi [Tue, 16 Jun 2015 19:32:39 +0000 (19:32 +0000)]
am 7e7e69a0: Merge "Print more diagnosis info on to-space invariant violation."

* commit '7e7e69a0421e30f5e6ffa498db25dfd0c13d500e':
  Print more diagnosis info on to-space invariant violation.

9 years agoMerge "Print more diagnosis info on to-space invariant violation."
Hiroshi Yamauchi [Tue, 16 Jun 2015 19:25:00 +0000 (19:25 +0000)]
Merge "Print more diagnosis info on to-space invariant violation."

9 years agoRevert "Revert "Use dlopen to load oat files.""
David Srbecky [Tue, 16 Jun 2015 17:12:34 +0000 (17:12 +0000)]
Revert "Revert "Use dlopen to load oat files.""

This reverts commit 7a46b7e235a7c35191cd9ddbab6ca4db0e535da5.

Change-Id: I33439d0e3d7a7e63591a8c7b356e716dcb62bca1

9 years agoExercise sun.misc.Unsafe.getObject.
Roland Levillain [Tue, 16 Jun 2015 17:09:26 +0000 (18:09 +0100)]
Exercise sun.misc.Unsafe.getObject.

Change-Id: I6b3c090e1db7302d6f5b81ab91d5a1dc218fae93

9 years agoam 5267866b: am 977be5f1: Merge "Disable -Wframe-larger-than when building SANITIZE_T...
Evgenii Stepanov [Tue, 16 Jun 2015 16:49:49 +0000 (16:49 +0000)]
am 5267866b: am 977be5f1: Merge "Disable -Wframe-larger-than when building SANITIZE_TARGET."

* commit '5267866bde84f15f2b3ccce8c0c36a9aaf425388':
  Disable -Wframe-larger-than when building SANITIZE_TARGET.

9 years agoam 977be5f1: Merge "Disable -Wframe-larger-than when building SANITIZE_TARGET."
Evgenii Stepanov [Tue, 16 Jun 2015 16:43:22 +0000 (16:43 +0000)]
am 977be5f1: Merge "Disable -Wframe-larger-than when building SANITIZE_TARGET."

* commit '977be5f1337e58c48aaa91822773d301117accfc':
  Disable -Wframe-larger-than when building SANITIZE_TARGET.

9 years agoMerge "Disable -Wframe-larger-than when building SANITIZE_TARGET."
Evgenii Stepanov [Tue, 16 Jun 2015 16:34:26 +0000 (16:34 +0000)]
Merge "Disable -Wframe-larger-than when building SANITIZE_TARGET."

9 years agoam df79cf4e: am 6ae58362: Merge "Update jdwp and libcore scripts for running with...
Nicolas Geoffray [Tue, 16 Jun 2015 14:52:13 +0000 (14:52 +0000)]
am df79cf4e: am 6ae58362: Merge "Update jdwp and libcore scripts for running with libartd."

* commit 'df79cf4ece176ba2eb230d0d71a364d55793658c':
  Update jdwp and libcore scripts for running with libartd.

9 years agoam 6ae58362: Merge "Update jdwp and libcore scripts for running with libartd."
Nicolas Geoffray [Tue, 16 Jun 2015 14:40:44 +0000 (14:40 +0000)]
am 6ae58362: Merge "Update jdwp and libcore scripts for running with libartd."

* commit '6ae5836285323d849769f3ab5a97c0a0e97908c5':
  Update jdwp and libcore scripts for running with libartd.

9 years agoMerge "Update jdwp and libcore scripts for running with libartd."
Nicolas Geoffray [Tue, 16 Jun 2015 14:33:00 +0000 (14:33 +0000)]
Merge "Update jdwp and libcore scripts for running with libartd."

9 years agoam 9e859ac4: am db40ea76: Merge "Revert "ART: Implement literal pool for arm, fix...
Vladimir Marko [Tue, 16 Jun 2015 11:57:36 +0000 (11:57 +0000)]
am 9e859ac4: am db40ea76: Merge "Revert "ART: Implement literal pool for arm, fix branch fixup.""

* commit '9e859ac458d017e05f2cd4adc99b4c6326e79829':
  Revert "ART: Implement literal pool for arm, fix branch fixup."

9 years agoam db40ea76: Merge "Revert "ART: Implement literal pool for arm, fix branch fixup.""
Vladimir Marko [Tue, 16 Jun 2015 11:44:39 +0000 (11:44 +0000)]
am db40ea76: Merge "Revert "ART: Implement literal pool for arm, fix branch fixup.""

* commit 'db40ea768bd914125c3754dacb9b6f534a2e2399':
  Revert "ART: Implement literal pool for arm, fix branch fixup."

9 years agoMerge "Revert "ART: Implement literal pool for arm, fix branch fixup.""
Vladimir Marko [Tue, 16 Jun 2015 11:32:24 +0000 (11:32 +0000)]
Merge "Revert "ART: Implement literal pool for arm, fix branch fixup.""

9 years agoRevert "ART: Implement literal pool for arm, fix branch fixup."
Vladimir Marko [Tue, 16 Jun 2015 11:32:01 +0000 (11:32 +0000)]
Revert "ART: Implement literal pool for arm, fix branch fixup."

This reverts commit f38caa68cce551fb153dff37d01db518e58ed00f.

Change-Id: Id88b82cc949d288cfcdb3c401b96f884b777fc40
Reason: broke the tests.

9 years agoam dd6864da: am e4394f7d: Merge "ART: Implement literal pool for arm, fix branch...
Vladimir Marko [Tue, 16 Jun 2015 09:59:17 +0000 (09:59 +0000)]
am dd6864da: am e4394f7d: Merge "ART: Implement literal pool for arm, fix branch fixup."

* commit 'dd6864da4d08799e1b3f37cd384e440dc03b742e':
  ART: Implement literal pool for arm, fix branch fixup.

9 years agoam e4394f7d: Merge "ART: Implement literal pool for arm, fix branch fixup."
Vladimir Marko [Tue, 16 Jun 2015 09:48:03 +0000 (09:48 +0000)]
am e4394f7d: Merge "ART: Implement literal pool for arm, fix branch fixup."

* commit 'e4394f7de28ae0b517daa033749979e46ff676ab':
  ART: Implement literal pool for arm, fix branch fixup.

9 years agoMerge "ART: Implement literal pool for arm, fix branch fixup."
Vladimir Marko [Tue, 16 Jun 2015 09:06:59 +0000 (09:06 +0000)]
Merge "ART: Implement literal pool for arm, fix branch fixup."

9 years agoPrint more diagnosis info on to-space invariant violation.
Hiroshi Yamauchi [Sat, 13 Jun 2015 01:35:06 +0000 (18:35 -0700)]
Print more diagnosis info on to-space invariant violation.

Pass the method/field (in GcRootSource) to the read barrier to print
more info when a to-space invariant violation is detected on a
method/field GC root access.

Refactor ConcurrentCopying::AssertToSpaceInvariant().

Bug: 12687968
Bug: 21564728

Change-Id: I3a5fde1f41969349b0fee6cd9217b948d5241a7c

9 years agoam e1799314: am f6c77d76: Merge "Revert "Use dlopen to load oat files.""
David Srbecky [Tue, 16 Jun 2015 00:05:34 +0000 (00:05 +0000)]
am e1799314: am f6c77d76: Merge "Revert "Use dlopen to load oat files.""

* commit 'e1799314901ff477f1233a1c81a6ca2ba0f6ccb0':
  Revert "Use dlopen to load oat files."

9 years agoam f6c77d76: Merge "Revert "Use dlopen to load oat files.""
David Srbecky [Mon, 15 Jun 2015 23:52:50 +0000 (23:52 +0000)]
am f6c77d76: Merge "Revert "Use dlopen to load oat files.""

* commit 'f6c77d7632bdfe564c2ba61690fecc65f10ea9f6':
  Revert "Use dlopen to load oat files."

9 years agoMerge "Revert "Use dlopen to load oat files.""
David Srbecky [Mon, 15 Jun 2015 23:44:58 +0000 (23:44 +0000)]
Merge "Revert "Use dlopen to load oat files.""

9 years agoRevert "Use dlopen to load oat files."
David Srbecky [Mon, 15 Jun 2015 23:44:08 +0000 (23:44 +0000)]
Revert "Use dlopen to load oat files."

This reverts commit 49e1fabc85480f01077f3cc10e8ba6ada6e4befa.

Change-Id: If49e8b60c458a992519b7fdabe02e7d53830edab

9 years agoDisable -Wframe-larger-than when building SANITIZE_TARGET.
Evgenii Stepanov [Mon, 15 Jun 2015 22:55:22 +0000 (15:55 -0700)]
Disable -Wframe-larger-than when building SANITIZE_TARGET.

The same has been done for SANITIZE_HOST some time ago.
AddressSanitizer adds redzones around local variables, increasing
function frame size by 2x to 3x.

Bug: 21785137
Change-Id: If53456894a2e6e38318b681dbc69547b05b6f33c

9 years agoUpdate jdwp and libcore scripts for running with libartd.
Nicolas Geoffray [Mon, 15 Jun 2015 13:35:01 +0000 (14:35 +0100)]
Update jdwp and libcore scripts for running with libartd.

Also make run-libcore-tests.sh a bit smarter by knowing
some of the arguments it needs to pass to vogar.

bug:21746693

Change-Id: Ib92b5f96ba8f15ff1de5fb387e67b3d14ce233c9

9 years agoam 8c4e5a15: am 6ebf70ec: Merge "Fix error message description in Checker"
David Brazdil [Mon, 15 Jun 2015 14:23:52 +0000 (14:23 +0000)]
am 8c4e5a15: am 6ebf70ec: Merge "Fix error message description in Checker"

* commit '8c4e5a159ccf4194063bd45be1ab1ce9cd997d79':
  Fix error message description in Checker

9 years agoART: Implement literal pool for arm, fix branch fixup.
Vladimir Marko [Fri, 29 May 2015 14:50:18 +0000 (15:50 +0100)]
ART: Implement literal pool for arm, fix branch fixup.

Change-Id: Iecc91418bb4ee1c957f42fefb737d0ee2ba960e7

9 years agoam c6939e59: am 2cbeb52c: Merge "Bring ReferenceTypePropagation to ArrayGet"
Calin Juravle [Mon, 15 Jun 2015 14:11:24 +0000 (14:11 +0000)]
am c6939e59: am 2cbeb52c: Merge "Bring ReferenceTypePropagation to ArrayGet"

* commit 'c6939e590b3524d56be057584eb0218d4b80c85e':
  Bring ReferenceTypePropagation to ArrayGet

9 years agoam 0ba88297: am 6e41d816: Merge "Bring ReferenceTypePropagation to HInvoke return...
Calin Juravle [Mon, 15 Jun 2015 14:11:23 +0000 (14:11 +0000)]
am 0ba88297: am 6e41d816: Merge "Bring ReferenceTypePropagation to HInvoke return types"

* commit '0ba882976c8fb4cebfda3a600ba72e1f2a0ef7a9':
  Bring ReferenceTypePropagation to HInvoke return types

9 years agoam 6ebf70ec: Merge "Fix error message description in Checker"
David Brazdil [Mon, 15 Jun 2015 14:10:33 +0000 (14:10 +0000)]
am 6ebf70ec: Merge "Fix error message description in Checker"

* commit '6ebf70ec61eff097e1bdddb1b887316389e34dde':
  Fix error message description in Checker

9 years agoMerge "Fix error message description in Checker"
David Brazdil [Mon, 15 Jun 2015 13:59:42 +0000 (13:59 +0000)]
Merge "Fix error message description in Checker"

9 years agoam 2cbeb52c: Merge "Bring ReferenceTypePropagation to ArrayGet"
Calin Juravle [Mon, 15 Jun 2015 13:58:37 +0000 (13:58 +0000)]
am 2cbeb52c: Merge "Bring ReferenceTypePropagation to ArrayGet"

* commit '2cbeb52ca5a56f54ca2e419cd8a697f46ba8e6ae':
  Bring ReferenceTypePropagation to ArrayGet

9 years agoam 6e41d816: Merge "Bring ReferenceTypePropagation to HInvoke return types"
Calin Juravle [Mon, 15 Jun 2015 13:58:36 +0000 (13:58 +0000)]
am 6e41d816: Merge "Bring ReferenceTypePropagation to HInvoke return types"

* commit '6e41d81695531499d34345354006cf4314f4559a':
  Bring ReferenceTypePropagation to HInvoke return types

9 years agoFix error message description in Checker
David Brazdil [Mon, 15 Jun 2015 13:57:29 +0000 (14:57 +0100)]
Fix error message description in Checker

Change-Id: Ieaecd430b096f91cc41af6354ee82176fe60a037

9 years agoMerge "Bring ReferenceTypePropagation to ArrayGet"
Calin Juravle [Mon, 15 Jun 2015 13:50:45 +0000 (13:50 +0000)]
Merge "Bring ReferenceTypePropagation to ArrayGet"

9 years agoMerge "Bring ReferenceTypePropagation to HInvoke return types"
Calin Juravle [Mon, 15 Jun 2015 13:50:31 +0000 (13:50 +0000)]
Merge "Bring ReferenceTypePropagation to HInvoke return types"

9 years agoam eac32860: am 3b74dcc5: Merge "Move Level1 to its own file."
Nicolas Geoffray [Mon, 15 Jun 2015 13:47:58 +0000 (13:47 +0000)]
am eac32860: am 3b74dcc5: Merge "Move Level1 to its own file."

* commit 'eac32860ef0c3749d26eb864004432abc4ee68fa':
  Move Level1 to its own file.

9 years agoam 3b74dcc5: Merge "Move Level1 to its own file."
Nicolas Geoffray [Mon, 15 Jun 2015 13:31:51 +0000 (13:31 +0000)]
am 3b74dcc5: Merge "Move Level1 to its own file."

* commit '3b74dcc55cedd43c2898d301bd472f67bf7f6b08':
  Move Level1 to its own file.

9 years agoMerge "Move Level1 to its own file."
Nicolas Geoffray [Mon, 15 Jun 2015 13:19:27 +0000 (13:19 +0000)]
Merge "Move Level1 to its own file."

9 years agoMove Level1 to its own file.
Nicolas Geoffray [Mon, 15 Jun 2015 12:58:00 +0000 (13:58 +0100)]
Move Level1 to its own file.

When we don't have oat files, we use runtime semantics
for checking access. At runtime, we're checking whether
the class loader is the same between two classes. This is
information we don't have when we run dex2oat at install time.

So movining Level1 to a public class fixes the access issue
when running the test with --no-prebuild --no-dex2oat.

Change-Id: Ied1f33a9e651f0045501c939eaf94b7b34ba1e66

9 years agoBring ReferenceTypePropagation to ArrayGet
Guillaume "Vermeille" Sanchez [Tue, 2 Jun 2015 16:39:45 +0000 (17:39 +0100)]
Bring ReferenceTypePropagation to ArrayGet

Change-Id: I602b494c4e18bd78313ce9711ff363c31570a57c

9 years agoBring ReferenceTypePropagation to HInvoke return types
Guillaume "Vermeille" Sanchez [Fri, 29 May 2015 09:52:55 +0000 (10:52 +0100)]
Bring ReferenceTypePropagation to HInvoke return types

Change-Id: Id0683f67e32874713a30c072c71dc537b1271926

9 years agoam a1231cab: am c4977a58: Merge "Fix reference comparison after redundant phi elimina...
Nicolas Geoffray [Mon, 15 Jun 2015 09:42:42 +0000 (09:42 +0000)]
am a1231cab: am c4977a58: Merge "Fix reference comparison after redundant phi elimination."

* commit 'a1231cab6c25421888a01d1825f24c398f2d5046':
  Fix reference comparison after redundant phi elimination.

9 years agoam 605bab3d: am 6c84df35: Merge "Fix lint error."
Nicolas Geoffray [Mon, 15 Jun 2015 09:36:54 +0000 (09:36 +0000)]
am 605bab3d: am 6c84df35: Merge "Fix lint error."

* commit '605bab3d3a9e32304c8fbb0bc7d62dfa5741cf25':
  Fix lint error.

9 years agoam c4977a58: Merge "Fix reference comparison after redundant phi elimination."
Nicolas Geoffray [Mon, 15 Jun 2015 09:35:48 +0000 (09:35 +0000)]
am c4977a58: Merge "Fix reference comparison after redundant phi elimination."

* commit 'c4977a58b1feca22a83fd5239aa266c7ce16ab87':
  Fix reference comparison after redundant phi elimination.

9 years agoMerge "Fix reference comparison after redundant phi elimination."
Nicolas Geoffray [Mon, 15 Jun 2015 08:57:42 +0000 (08:57 +0000)]
Merge "Fix reference comparison after redundant phi elimination."

9 years agoFix reference comparison after redundant phi elimination.
Nicolas Geoffray [Mon, 15 Jun 2015 08:01:08 +0000 (09:01 +0100)]
Fix reference comparison after redundant phi elimination.

Otherwise, the graph could remain mistyped.

bug:21776173

Change-Id: I491f4b95e1763cbd1ade777da0a23bae319fed63

9 years agoam 1884861a: am d11db7dd: Merge "Use the caller\'s class loader when walking inlined...
Nicolas Geoffray [Mon, 15 Jun 2015 08:06:59 +0000 (08:06 +0000)]
am 1884861a: am d11db7dd: Merge "Use the caller\'s class loader when walking inlined frames."

* commit '1884861ac8d4d6f3042d0de1ba858a8a1dba686d':
  Use the caller's class loader when walking inlined frames.

9 years agoam 6c84df35: Merge "Fix lint error."
Nicolas Geoffray [Mon, 15 Jun 2015 08:06:27 +0000 (08:06 +0000)]
am 6c84df35: Merge "Fix lint error."

* commit '6c84df35a85ac2df8a9ce6cb902136507aca38ad':
  Fix lint error.

9 years agoMerge "Fix lint error."
Nicolas Geoffray [Mon, 15 Jun 2015 07:58:49 +0000 (07:58 +0000)]
Merge "Fix lint error."

9 years agoFix lint error.
Nicolas Geoffray [Mon, 15 Jun 2015 07:58:03 +0000 (08:58 +0100)]
Fix lint error.

Change-Id: I839d547bd3f7c814e2db2b9b40119fdd13469ee6

9 years agoam d11db7dd: Merge "Use the caller\'s class loader when walking inlined frames."
Nicolas Geoffray [Mon, 15 Jun 2015 07:55:31 +0000 (07:55 +0000)]
am d11db7dd: Merge "Use the caller\'s class loader when walking inlined frames."

* commit 'd11db7dd312a64928fa41a2d7472f49ede0c7346':
  Use the caller's class loader when walking inlined frames.