OSDN Git Service

android-x86/art.git
9 years agoVerifier: check an aput, even if we know it will fail.
Nicolas Geoffray [Fri, 19 Jun 2015 09:35:42 +0000 (10:35 +0100)]
Verifier: check an aput, even if we know it will fail.

bug:21867457
Change-Id: I01e333d858995d0e1e083a50cf8d460a86381f2c

9 years agoMerge "Run a simplification pass before code generation."
Nicolas Geoffray [Thu, 18 Jun 2015 15:52:30 +0000 (15:52 +0000)]
Merge "Run a simplification pass before code generation."

9 years agoMerge "Don't special case HCurrentMethod in DCE."
Nicolas Geoffray [Thu, 18 Jun 2015 15:51:54 +0000 (15:51 +0000)]
Merge "Don't special case HCurrentMethod in DCE."

9 years agoMerge "Quick: Fix marking unused registers in DCE."
Vladimir Marko [Thu, 18 Jun 2015 15:51:35 +0000 (15:51 +0000)]
Merge "Quick: Fix marking unused registers in DCE."

9 years agoRun a simplification pass before code generation.
Nicolas Geoffray [Thu, 18 Jun 2015 14:46:47 +0000 (15:46 +0100)]
Run a simplification pass before code generation.

The code generators assume things that only the instruction
simplier ensures. So it has to be run last in case previous
optimiziations broke those assumptions.

bug:21865464

Change-Id: I1f84016017bf691c2a34982e202a505b269f609a

9 years agoMerge "ART: Fix reporting initialized classes by CompilerDriver."
Vladimir Marko [Thu, 18 Jun 2015 14:19:22 +0000 (14:19 +0000)]
Merge "ART: Fix reporting initialized classes by CompilerDriver."

9 years agoMerge "ART: Remove old DCHECK that trips Baseline"
David Brazdil [Thu, 18 Jun 2015 11:54:57 +0000 (11:54 +0000)]
Merge "ART: Remove old DCHECK that trips Baseline"

9 years agoMerge "Bailout from compilation if an invoke is malformed."
Nicolas Geoffray [Thu, 18 Jun 2015 11:53:49 +0000 (11:53 +0000)]
Merge "Bailout from compilation if an invoke is malformed."

9 years agoART: Remove old DCHECK that trips Baseline
David Brazdil [Thu, 18 Jun 2015 11:40:01 +0000 (12:40 +0100)]
ART: Remove old DCHECK that trips Baseline

Codegen verified that the entry block always falls through to the next
block. While this is the case with Optimizing, it doesn't hold for
Baseline but it doesn't need to since codegen handles it fine.

Bug:21913514
Change-Id: I751ef227e6cf103af3e7fc35fca4b01c663385a1

9 years agoBailout from compilation if an invoke is malformed.
Nicolas Geoffray [Thu, 18 Jun 2015 10:11:27 +0000 (11:11 +0100)]
Bailout from compilation if an invoke is malformed.

Because the verifier does not check trivially dead instructions,
the compilers must prepare for bogus instructions. This change
fixes the case the arguments for an invoke do not match the
formal parameters.

bug:21865459

Change-Id: Ie9fa9dbaedaad0350a52391252e18c045056454d

9 years agoMerge "Fix a bug in optimizing when the null constant has been DCE."
Nicolas Geoffray [Thu, 18 Jun 2015 11:46:30 +0000 (11:46 +0000)]
Merge "Fix a bug in optimizing when the null constant has been DCE."

9 years agoART: Fix reporting initialized classes by CompilerDriver.
Vladimir Marko [Mon, 15 Jun 2015 17:52:54 +0000 (18:52 +0100)]
ART: Fix reporting initialized classes by CompilerDriver.

Fix a bug where the CompilerDriver was erroneously reporting
classes as initialized during AOT compilation when they were
not guaranteed to be initialized at runtime.

This fix prevents the Quick compiler from inlining calls to
static methods in classes that are not guaranteed to be
initialized, so that the runtime performs the initialization
required for correctness.

Bug: 21847756
Change-Id: I6fee5ef9c05c2e5190ab8a9fe61365d5119011c5

9 years agoQuick: Fix marking unused registers in DCE.
Vladimir Marko [Wed, 17 Jun 2015 21:00:09 +0000 (22:00 +0100)]
Quick: Fix marking unused registers in DCE.

Bug: 21702651
Change-Id: Idca17b465152e0c61704fc49761c7ba89caf5b20

9 years agoMerge "Forgot this change in last commit."
Nicolas Geoffray [Thu, 18 Jun 2015 07:42:02 +0000 (07:42 +0000)]
Merge "Forgot this change in last commit."

9 years agoMerge "Fix some java_lang_Class related moving GC bugs"
Mathieu Chartier [Thu, 18 Jun 2015 00:02:11 +0000 (00:02 +0000)]
Merge "Fix some java_lang_Class related moving GC bugs"

9 years agoFix some java_lang_Class related moving GC bugs
Mathieu Chartier [Wed, 17 Jun 2015 23:11:12 +0000 (16:11 -0700)]
Fix some java_lang_Class related moving GC bugs

There was some missing handles around mirror::Class*.

Bug: 21898408
Change-Id: Icb754074dfb469473101d20d6873a5bc3274abc5

9 years agoMerge "Add missing EndAssertNoThreadSuspension"
Mathieu Chartier [Wed, 17 Jun 2015 22:42:46 +0000 (22:42 +0000)]
Merge "Add missing EndAssertNoThreadSuspension"

9 years agoFix a bug in optimizing when the null constant has been DCE.
Nicolas Geoffray [Wed, 17 Jun 2015 22:09:05 +0000 (23:09 +0100)]
Fix a bug in optimizing when the null constant has been DCE.

If it has been DCE, we should create a new one, instead of
using the old one.

Also move the first DCE to a place where it could actually
be useful.

bug:21870788

Change-Id: I28fc52ae481ef92cba45fc1b5abcf07c995f524c

9 years agoMerge "Release dummy MemMaps corresponding to dlopen."
David Srbecky [Wed, 17 Jun 2015 21:59:58 +0000 (21:59 +0000)]
Merge "Release dummy MemMaps corresponding to dlopen."

9 years agoRelease dummy MemMaps corresponding to dlopen.
David Srbecky [Wed, 17 Jun 2015 17:36:23 +0000 (18:36 +0100)]
Release dummy MemMaps corresponding to dlopen.

This fixes memory leak.

Change-Id: I857f078e8559a56b2d10dd081256c41ab28c8ec6

9 years agoAdd missing EndAssertNoThreadSuspension
Mathieu Chartier [Wed, 17 Jun 2015 21:14:36 +0000 (14:14 -0700)]
Add missing EndAssertNoThreadSuspension

(cherry picked from commit a3b9d4eda1ef0845f307891f349eaf752750ac16)

Bug: 21872507
Change-Id: I20f9920e4a12511ce498c252bca955d82a4f4102

9 years agoDon't special case HCurrentMethod in DCE.
Nicolas Geoffray [Wed, 17 Jun 2015 10:57:56 +0000 (11:57 +0100)]
Don't special case HCurrentMethod in DCE.

Instead, re-create the HCurrentMethod if it is needed
after it has been removed.

Change-Id: Id3bf15ae87b00a1d7eb35bf36d58fe96f788fba4

9 years agoForgot this change in last commit.
Nicolas Geoffray [Mon, 15 Jun 2015 13:35:01 +0000 (14:35 +0100)]
Forgot this change in last commit.

bug:21746693
Change-Id: I1ae9690d393cf1bae10cb06ff1c6754ab2a50595

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

9 years agoART: Allow PackedSwitch instructions with zero targets
David Brazdil [Wed, 17 Jun 2015 17:20:52 +0000 (18:20 +0100)]
ART: Allow PackedSwitch instructions with zero targets

Optimizing and the interpreter wrongly assumed that a PackedSwitch
always has at least one target. This patch removes the corresponding
DCHECKs and adds a regression test case.

This is a resubmission of CL I32b7033ed38de6f1d1a6ee5d5bf12f3a47c9b37e

Bug: 21863783
Change-Id: I04e6e124bdd16591ba27c79490e6ce183c36b691

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

9 years agoRevert "ART: Allow PackedSwitch instructions with zero targets"
David Brazdil [Wed, 17 Jun 2015 16:59:53 +0000 (16:59 +0000)]
Revert "ART: Allow PackedSwitch instructions with zero targets"

This fixed Optimizing but revealed the same issue in the interpreter.

This reverts commit 241f9c41924e33e0c3bab9a7c4306397458749ca.

Change-Id: Iad5a28b24f2c21d3575cf8ecc8b7c8fbf98d1132

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 agoMerge "Use the caller's class loader when walking inlined frames."
Nicolas Geoffray [Mon, 15 Jun 2015 07:46:41 +0000 (07:46 +0000)]
Merge "Use the caller's class loader when walking inlined frames."

9 years agoMerge "Revert "art/tools: add new tests in security packages to the build bot""
Nicolas Geoffray [Sat, 13 Jun 2015 13:29:28 +0000 (13:29 +0000)]
Merge "Revert "art/tools: add new tests in security packages to the build bot""

9 years agoRevert "art/tools: add new tests in security packages to the build bot"
Nicolas Geoffray [Sat, 13 Jun 2015 13:19:16 +0000 (13:19 +0000)]
Revert "art/tools: add new tests in security packages to the build bot"

Unfortunately still seeing failures due to localhost uses.

This reverts commit a04ece3175403413a213cd54900860857e780879.

Change-Id: I9572e53bc1ef405060359f0eeaa1f726299349b3

9 years agoMerge "ART: Fix CFI test wrt/ PIC"
Andreas Gampe [Sat, 13 Jun 2015 03:40:56 +0000 (03:40 +0000)]
Merge "ART: Fix CFI test wrt/ PIC"

9 years agoART: Fix CFI test wrt/ PIC
Andreas Gampe [Sat, 13 Jun 2015 03:38:49 +0000 (20:38 -0700)]
ART: Fix CFI test wrt/ PIC

PIC boot images can't be loaded with dlopen, as their base is zero,
but we have an expectant address. Turn off in-process unwinding
in 137-cfi by checking the boot image oat file type.

Keep a non-owned referenced to the oat file in image space to simplify
access.

Change-Id: Ia2b525f9b2ecbc80b433f09e04ebece4cb6f2d2b

9 years agoMerge "Pass reuse flag to MemMap constructor"
Mathieu Chartier [Sat, 13 Jun 2015 00:53:10 +0000 (00:53 +0000)]
Merge "Pass reuse flag to MemMap constructor"

9 years agoMerge "Let classloader provide correct LD_LIBRARY_PATH"
Dmitriy Ivanov [Sat, 13 Jun 2015 00:43:56 +0000 (00:43 +0000)]
Merge "Let classloader provide correct LD_LIBRARY_PATH"

9 years agoPass reuse flag to MemMap constructor
Mathieu Chartier [Sat, 13 Jun 2015 00:32:31 +0000 (17:32 -0700)]
Pass reuse flag to MemMap constructor

Bug: 21806978
Change-Id: Iec92220d8f42e1d702ee39b27a8de570ea1ab588

9 years agoMerge "Use dlopen to load oat files."
David Srbecky [Fri, 12 Jun 2015 23:04:49 +0000 (23:04 +0000)]
Merge "Use dlopen to load oat files."

9 years agoUse dlopen to load oat files.
David Srbecky [Thu, 11 Jun 2015 16:38:44 +0000 (17:38 +0100)]
Use dlopen to load oat files.

This is required to support in-process unwinding in libunwind.
libunwind obtains the list of loaded libraries from the linker,
therefore we need to use dlopen, otherwise it will not find them.

Change-Id: I5fd89cce6b909385cb89b8a48c0d817677acf299

9 years agoMerge "JDWP: update handling of 8-bit and 16-bit fields"
Sebastien Hertz [Fri, 12 Jun 2015 17:38:21 +0000 (17:38 +0000)]
Merge "JDWP: update handling of 8-bit and 16-bit fields"

9 years agoJDWP: update handling of 8-bit and 16-bit fields
Sebastien Hertz [Thu, 11 Jun 2015 16:42:58 +0000 (18:42 +0200)]
JDWP: update handling of 8-bit and 16-bit fields

We must use special getter/setter for types smaller than int:
boolean, byte, char and short. However, JDWP still requires to treat:
- int and float as 32-bit values
- long and double as 64-bit values

Bug: 21746739
Change-Id: I8d0ce46246084c9e16f287da28d8969d36b83b99

9 years agoMerge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
Calin Juravle [Fri, 12 Jun 2015 15:40:57 +0000 (15:40 +0000)]
Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""

9 years agoRevert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Fri, 12 Jun 2015 15:40:42 +0000 (15:40 +0000)]
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""

This reverts commit a981f9d5cac9a479d3b5d16508d71cfe17d95117.

Change-Id: I69faf16d5ef0ecc234fb52e071b682e728a8bf97

9 years agoMerge "Revert "Revert "Revert "Fix a checker test""""
Calin Juravle [Fri, 12 Jun 2015 15:40:13 +0000 (15:40 +0000)]
Merge "Revert "Revert "Revert "Fix a checker test""""

9 years agoRevert "Revert "Revert "Fix a checker test"""
Calin Juravle [Fri, 12 Jun 2015 15:39:26 +0000 (15:39 +0000)]
Revert "Revert "Revert "Fix a checker test"""

This reverts commit b9610e795b8df7b3ba8c6b2c38d6589c2a0e5321.

Change-Id: Id4550d578913a7eac02480b635b3c0a44dea2b4c

9 years agoMerge "Revert "Revert "Fix a checker test"""
Calin Juravle [Fri, 12 Jun 2015 15:26:57 +0000 (15:26 +0000)]
Merge "Revert "Revert "Fix a checker test"""

9 years agoRevert "Revert "Fix a checker test""
Calin Juravle [Fri, 12 Jun 2015 15:26:45 +0000 (15:26 +0000)]
Revert "Revert "Fix a checker test""

This reverts commit e27dd0ef36f225e9d52daa454b8030f3d485b982.

Change-Id: I7779ec9273cd9873828f31706ddaee3bc707be24

9 years agoMerge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Fri, 12 Jun 2015 15:26:32 +0000 (15:26 +0000)]
Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""

9 years agoRevert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Calin Juravle [Fri, 12 Jun 2015 15:26:21 +0000 (15:26 +0000)]
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""

This reverts commit 958857d0f9686770a3b1117166d5fa700b39704a.

Change-Id: I196ff2a4453489f0105efc54eee73a2a9321ac4e

9 years agoUse the caller's class loader when walking inlined frames.
Nicolas Geoffray [Fri, 12 Jun 2015 13:52:33 +0000 (14:52 +0100)]
Use the caller's class loader when walking inlined frames.

We should not use the outer most class loader. JLS specification
is to use the caller's class loader.

Change-Id: I736f36c9b6a44fab213ad0c01cf1efc975b9b3a6

9 years agoMerge "tools/buildbot-build.sh: Remove javalibcoretest from common targets"
Sergio Giro [Fri, 12 Jun 2015 14:30:08 +0000 (14:30 +0000)]
Merge "tools/buildbot-build.sh: Remove javalibcoretest from common targets"

9 years agotools/buildbot-build.sh: Remove javalibcoretest from common targets
Sergio Giro [Fri, 12 Jun 2015 14:16:26 +0000 (15:16 +0100)]
tools/buildbot-build.sh: Remove javalibcoretest from common targets

It's built in the make command

Change-Id: I702d54c38dd4492e19688d3949c1e610865d9260

9 years agoMerge "art/tools: add new tests in security packages to the build bot"
Sergio Giro [Fri, 12 Jun 2015 14:11:51 +0000 (14:11 +0000)]
Merge "art/tools: add new tests in security packages to the build bot"

9 years agoart/tools: add new tests in security packages to the build bot
Sergio Giro [Fri, 12 Jun 2015 11:35:51 +0000 (12:35 +0100)]
art/tools: add new tests in security packages to the build bot

Otherwise, it's difficult to know when they start to fail

Test packages added:
com.android.org.conscrypt
libcore.java.security
libcore.javax.net

Bug: 21722374
Change-Id: Ifc641d06a9a0e6ba23fbcb11f49025b8213351fe