OSDN Git Service

android-x86/art.git
7 years agoMerge "MIPS64: Add vector registers to Mips64ManagedRegister class" am: fbffc6706a
Aart Bik [Tue, 28 Mar 2017 17:22:56 +0000 (17:22 +0000)]
Merge "MIPS64: Add vector registers to Mips64ManagedRegister class" am: fbffc6706a
am: 706b70a272

Change-Id: I2c368e1d338a2dad9c82003f0273194fe50093a9

7 years agoMerge "MIPS64: Add vector registers to Mips64ManagedRegister class"
Aart Bik [Tue, 28 Mar 2017 17:18:55 +0000 (17:18 +0000)]
Merge "MIPS64: Add vector registers to Mips64ManagedRegister class"
am: fbffc6706a

Change-Id: I910aed63f5981a245488fbebd15778370e3fbb51

7 years agoMerge "MIPS64: Add vector registers to Mips64ManagedRegister class"
Aart Bik [Tue, 28 Mar 2017 17:09:28 +0000 (17:09 +0000)]
Merge "MIPS64: Add vector registers to Mips64ManagedRegister class"

7 years agoMerge "Math.round float intrinsic for ARM." am: 1082e0e46d
Nicolas Geoffray [Tue, 28 Mar 2017 12:59:09 +0000 (12:59 +0000)]
Merge "Math.round float intrinsic for ARM." am: 1082e0e46d
am: 80599cfaf8

Change-Id: I61fb5565805898e5e54b76e0f0e26a928c34bd52

7 years agoMerge "Math.round float intrinsic for ARM."
Nicolas Geoffray [Tue, 28 Mar 2017 12:54:39 +0000 (12:54 +0000)]
Merge "Math.round float intrinsic for ARM."
am: 1082e0e46d

Change-Id: I41776dabd5ec0e6b8324ad7af1d3fd361e9a801f

7 years agoMerge "Math.round float intrinsic for ARM."
Nicolas Geoffray [Tue, 28 Mar 2017 12:46:53 +0000 (12:46 +0000)]
Merge "Math.round float intrinsic for ARM."

7 years agoMath.round float intrinsic for ARM.
xueliang.zhong [Thu, 16 Feb 2017 15:18:03 +0000 (15:18 +0000)]
Math.round float intrinsic for ARM.

Test: m test-art-target
Test: m 082-inline-execute
Change-Id: I1b384e388b9959eca662922bffa8675cdbfe6e6b

7 years agoMerge "Make data dependency around HDeoptimize correct." am: 7359649f63
Nicolas Geoffray [Tue, 28 Mar 2017 08:18:53 +0000 (08:18 +0000)]
Merge "Make data dependency around HDeoptimize correct." am: 7359649f63
am: d572e3823c

Change-Id: I07766024e3213ca41d6694202f23bf81ce663e5f

7 years agoMerge "Make data dependency around HDeoptimize correct."
Nicolas Geoffray [Tue, 28 Mar 2017 08:14:24 +0000 (08:14 +0000)]
Merge "Make data dependency around HDeoptimize correct."
am: 7359649f63

Change-Id: I0e3b59bea877084841eafa886b237d5685e475ce

7 years agoMerge "Make data dependency around HDeoptimize correct."
Nicolas Geoffray [Tue, 28 Mar 2017 07:55:30 +0000 (07:55 +0000)]
Merge "Make data dependency around HDeoptimize correct."

7 years agoMerge "Remove unreachable code in DexLocationToOdexFilename." am: da3f60aed2
Richard Uhler [Tue, 28 Mar 2017 07:31:21 +0000 (07:31 +0000)]
Merge "Remove unreachable code in DexLocationToOdexFilename." am: da3f60aed2
am: ea4308f12b

Change-Id: Ia95180a0f828b955ad52f15108fb625e0f95ffd9

7 years agoMerge "Remove unreachable code in DexLocationToOdexFilename."
Richard Uhler [Tue, 28 Mar 2017 07:27:21 +0000 (07:27 +0000)]
Merge "Remove unreachable code in DexLocationToOdexFilename."
am: da3f60aed2

Change-Id: I0114c6c276251ee2a46ce4fb5a85b8ebe662599a

7 years agoMerge "Remove unreachable code in DexLocationToOdexFilename."
Richard Uhler [Tue, 28 Mar 2017 07:18:49 +0000 (07:18 +0000)]
Merge "Remove unreachable code in DexLocationToOdexFilename."

7 years agoMerge "ART: Fix some tidy warnings" am: 13e60fa0ac
Andreas Gampe [Tue, 28 Mar 2017 02:14:33 +0000 (02:14 +0000)]
Merge "ART: Fix some tidy warnings" am: 13e60fa0ac
am: 4213e68fc0

Change-Id: Idb22117ce38243f5fc49ec0c51017b1570df126c

7 years agoMerge "ART: Fix some tidy warnings"
Andreas Gampe [Tue, 28 Mar 2017 02:10:32 +0000 (02:10 +0000)]
Merge "ART: Fix some tidy warnings"
am: 13e60fa0ac

Change-Id: Ica45e63c53bbfa9f10c3308469f8fe5af13bcaf1

7 years agoMerge "ART: Fix some tidy warnings"
Treehugger Robot [Tue, 28 Mar 2017 02:01:24 +0000 (02:01 +0000)]
Merge "ART: Fix some tidy warnings"

7 years agoMerge "ART: Clean up field initialization" am: d66a932d38
Andreas Gampe [Tue, 28 Mar 2017 01:09:58 +0000 (01:09 +0000)]
Merge "ART: Clean up field initialization" am: d66a932d38
am: 891fa2ecd5

Change-Id: I646e7d8abd4e3b8ac7b3ae5dcc9d19827f7b322f

7 years agoMerge "ART: Clean up field initialization"
Andreas Gampe [Tue, 28 Mar 2017 01:06:29 +0000 (01:06 +0000)]
Merge "ART: Clean up field initialization"
am: d66a932d38

Change-Id: I010c734a09a798270b5cbfca325e022a2a9ea4fb

7 years agoMerge "ART: Clean up field initialization"
Andreas Gampe [Tue, 28 Mar 2017 00:56:35 +0000 (00:56 +0000)]
Merge "ART: Clean up field initialization"

7 years agoMerge "ART: Remove unused DexToDex level." am: cfc5fcbedc
Andreas Gampe [Tue, 28 Mar 2017 00:28:25 +0000 (00:28 +0000)]
Merge "ART: Remove unused DexToDex level." am: cfc5fcbedc
am: e801e10ede

Change-Id: I7255bb4ad875241afefbdfb777e18f77d61def2e

7 years agoMerge "ART: Remove unused DexToDex level."
Andreas Gampe [Tue, 28 Mar 2017 00:24:55 +0000 (00:24 +0000)]
Merge "ART: Remove unused DexToDex level."
am: cfc5fcbedc

Change-Id: Id38fd58fa60c7b5df687c197bb2941a625c134e5

7 years agoMerge "ART: Remove unused DexToDex level."
Treehugger Robot [Tue, 28 Mar 2017 00:17:01 +0000 (00:17 +0000)]
Merge "ART: Remove unused DexToDex level."

7 years agoMerge changes I45940d2d,I100b6246,Ie0ba58b3,I7943e7a6,I172cef38, ... am: 4fc76b3ff6
Josh Gao [Mon, 27 Mar 2017 23:20:21 +0000 (23:20 +0000)]
Merge changes I45940d2d,I100b6246,Ie0ba58b3,I7943e7a6,I172cef38, ... am: 4fc76b3ff6
am: 0b67b5a61b

Change-Id: I086e5b29d46a8aa81596c6b477feae86e523e622

7 years agoMerge changes I45940d2d,I100b6246,Ie0ba58b3,I7943e7a6,I172cef38, ...
Josh Gao [Mon, 27 Mar 2017 23:17:26 +0000 (23:17 +0000)]
Merge changes I45940d2d,I100b6246,Ie0ba58b3,I7943e7a6,I172cef38, ...
am: 4fc76b3ff6

Change-Id: I37c2a02a5e3a7a2a5d8f20a440eef6b8f1faaef2

7 years agoMerge changes I45940d2d,I100b6246,Ie0ba58b3,I7943e7a6,I172cef38, ...
Treehugger Robot [Mon, 27 Mar 2017 23:10:36 +0000 (23:10 +0000)]
Merge changes I45940d2d,I100b6246,Ie0ba58b3,I7943e7a6,I172cef38, ...

* changes:
  Remove signal mask checks from native bridge tests.
  sigchain: fix sigaction(signal, nullptr, &sa).
  sigchain: make SIG_DFL handling less broken.
  sigchain: allow use of sigprocmask inside handlers.
  sigchainlib: hopefully fix darwin build breakage.
  Revert^2: "Make sigchain actually own the signal chain.""

7 years agoMerge "Testrunner: Fix output parsing issue" am: cd29b3b2b2
Shubham Ajmera [Mon, 27 Mar 2017 22:47:48 +0000 (22:47 +0000)]
Merge "Testrunner: Fix output parsing issue" am: cd29b3b2b2
am: 6f1bf60243

Change-Id: I3934b35267b7fa213b71412e85e8d2c9c22b8095

7 years agoMerge "Testrunner: Fix output parsing issue"
Shubham Ajmera [Mon, 27 Mar 2017 22:44:48 +0000 (22:44 +0000)]
Merge "Testrunner: Fix output parsing issue"
am: cd29b3b2b2

Change-Id: I757f92c4d79fb5b0d73053b513a62cfe0623b9a7

7 years agoMerge "Testrunner: Fix output parsing issue"
Treehugger Robot [Mon, 27 Mar 2017 22:40:38 +0000 (22:40 +0000)]
Merge "Testrunner: Fix output parsing issue"

7 years agoART: Fix some tidy warnings
Andreas Gampe [Mon, 27 Mar 2017 22:14:27 +0000 (15:14 -0700)]
ART: Fix some tidy warnings

Fix some tidy warnings for macros and references.

Test: m test-art-host
Change-Id: I2f8ed2174634263d4784c08e637f60ed70977b73

7 years agoART: Remove unused DexToDex level.
Andreas Gampe [Mon, 27 Mar 2017 21:57:30 +0000 (14:57 -0700)]
ART: Remove unused DexToDex level.

There is only "skip" and "optimize." We no longer have a required
tier, as constructor fencing is now elision-based.

Bug: 36653594
Test: m test-art-host
Change-Id: Ide874a581fc5f887d020b3d32507e3973e7fd9a4

7 years agoRemove signal mask checks from native bridge tests.
Josh Gao [Mon, 27 Mar 2017 20:56:23 +0000 (13:56 -0700)]
Remove signal mask checks from native bridge tests.

Bug: http://b/36205469
Bug: http://b/36262089
Change-Id: I45940d2d189b6e144eb2f6ebb6d24fd70e3bd206

7 years agoART: Clean up field initialization
Andreas Gampe [Mon, 27 Mar 2017 20:27:24 +0000 (13:27 -0700)]
ART: Clean up field initialization

Add explicit field initialization to default value where necessary.
Also clean up interpreter intrinsics header.

Test: m
Change-Id: I7a850ac30dcccfb523a5569fb8400b9ac892c8e5

7 years agoMerge "One more test to disable for CHA." am: 46bfb7c047
Nicolas Geoffray [Mon, 27 Mar 2017 20:18:09 +0000 (20:18 +0000)]
Merge "One more test to disable for CHA." am: 46bfb7c047
am: 94a7fca769

Change-Id: Icf45749b45300b6f3841dccf6319c250c130339a

7 years agoMerge "One more test to disable for CHA."
Nicolas Geoffray [Mon, 27 Mar 2017 20:15:09 +0000 (20:15 +0000)]
Merge "One more test to disable for CHA."
am: 46bfb7c047

Change-Id: Ie09f638512f3e11912fef429cd44b22518f624bf

7 years agoMerge "One more test to disable for CHA."
Nicolas Geoffray [Mon, 27 Mar 2017 20:10:35 +0000 (20:10 +0000)]
Merge "One more test to disable for CHA."

7 years agoMerge "Ensure 'modified' field of ArtClassDefinition is always initialized." am:...
Alex Light [Mon, 27 Mar 2017 19:48:38 +0000 (19:48 +0000)]
Merge "Ensure 'modified' field of ArtClassDefinition is always initialized." am: 238fdfcec3
am: 8861b265e8

Change-Id: I2b5e38943ab20e90469329001484d51f6c0e70f3

7 years agoMerge "Ensure 'modified' field of ArtClassDefinition is always initialized."
Alex Light [Mon, 27 Mar 2017 19:45:37 +0000 (19:45 +0000)]
Merge "Ensure 'modified' field of ArtClassDefinition is always initialized."
am: 238fdfcec3

Change-Id: Ie20cd05694051763dff2725b9143613c141b8088

7 years agoMerge "Ensure 'modified' field of ArtClassDefinition is always initialized."
Treehugger Robot [Mon, 27 Mar 2017 19:40:19 +0000 (19:40 +0000)]
Merge "Ensure 'modified' field of ArtClassDefinition is always initialized."

7 years agoOne more test to disable for CHA.
Nicolas Geoffray [Mon, 27 Mar 2017 19:34:56 +0000 (20:34 +0100)]
One more test to disable for CHA.

bug:36344221
Change-Id: I03f6a3d9c6da9c3cd7e838a0c34a2cca0ab29f26

7 years agoMerge "Testrunner: Temporarily fix long Dex File name issue" am: c64fb4d48a
Shubham Ajmera [Mon, 27 Mar 2017 19:10:04 +0000 (19:10 +0000)]
Merge "Testrunner: Temporarily fix long Dex File name issue" am: c64fb4d48a
am: b18d889393

Change-Id: I0168d2b172b6bbee839741a27904d14b498dcd80

7 years agoMerge "Testrunner: Temporarily fix long Dex File name issue"
Shubham Ajmera [Mon, 27 Mar 2017 19:07:03 +0000 (19:07 +0000)]
Merge "Testrunner: Temporarily fix long Dex File name issue"
am: c64fb4d48a

Change-Id: I1cc57c63331f8e7415f9d10993aee313f7bb08c0

7 years agoMerge "Testrunner: Temporarily fix long Dex File name issue"
Treehugger Robot [Mon, 27 Mar 2017 19:02:08 +0000 (19:02 +0000)]
Merge "Testrunner: Temporarily fix long Dex File name issue"

7 years agoMerge "Ensure jvmtiCapabilities structs are initialized." am: b20a9da907
Alex Light [Mon, 27 Mar 2017 18:38:03 +0000 (18:38 +0000)]
Merge "Ensure jvmtiCapabilities structs are initialized." am: b20a9da907
am: 351fe7017f

Change-Id: If57cb16a54147eee9d811aff9f250f22b5099ed8

7 years agoMerge "Ensure jvmtiCapabilities structs are initialized."
Alex Light [Mon, 27 Mar 2017 18:35:03 +0000 (18:35 +0000)]
Merge "Ensure jvmtiCapabilities structs are initialized."
am: b20a9da907

Change-Id: Ie6793c19c81b2b5fb190d8c3e3d3bda99e9e83c8

7 years agoMerge "Ensure jvmtiCapabilities structs are initialized."
Treehugger Robot [Mon, 27 Mar 2017 18:27:38 +0000 (18:27 +0000)]
Merge "Ensure jvmtiCapabilities structs are initialized."

7 years agoTestrunner: Fix output parsing issue
Shubham Ajmera [Fri, 24 Mar 2017 23:19:48 +0000 (16:19 -0700)]
Testrunner: Fix output parsing issue

Android build system determines failure info in the build log
by looking for a line starting with "FAILED: ".

The new format of the testrunner makes sure that the build system
is able to parse the error from the log.

Test: ./art/test.py -r -t 00
Change-Id: Iab29f254f600d4c3ee74cae2675da3a624e724ef

7 years agoEnsure 'modified' field of ArtClassDefinition is always initialized.
Alex Light [Sat, 25 Mar 2017 00:28:30 +0000 (17:28 -0700)]
Ensure 'modified' field of ArtClassDefinition is always initialized.

This field was not always being initialized due to the use of a
default constructor. This meant we would go down unintended code paths
in some circumstances.

Test: ./test.py --host -j40
Bug: 36602266

Change-Id: Iba3521d4a2fa752a7ba59dcbcbbd30e0c09869ff

7 years agoEnsure jvmtiCapabilities structs are initialized.
Alex Light [Mon, 27 Mar 2017 16:50:36 +0000 (09:50 -0700)]
Ensure jvmtiCapabilities structs are initialized.

We were not zero-ing a handful of jvmtiCapabilities structs.

Bug: 31455788
Test: ./test.py --host -j40
Change-Id: Ia8c67a10e3b9068bb198392d48831b36290953bf

7 years agoMerge "Check for unattached threads in JVMTI functions" am: 3b8adf50f6
Alex Light [Mon, 27 Mar 2017 16:31:25 +0000 (16:31 +0000)]
Merge "Check for unattached threads in JVMTI functions" am: 3b8adf50f6
am: 1d2ac32c09

Change-Id: I07bb03928f604a6a45c235c50e3fa3c0c0a4eb8a

7 years agoMerge "Check for unattached threads in JVMTI functions"
Alex Light [Mon, 27 Mar 2017 16:28:24 +0000 (16:28 +0000)]
Merge "Check for unattached threads in JVMTI functions"
am: 3b8adf50f6

Change-Id: I084302cd3de9af95fc217ae1226d17dc83f1414f

7 years agoMerge "Check for unattached threads in JVMTI functions"
Treehugger Robot [Mon, 27 Mar 2017 16:22:16 +0000 (16:22 +0000)]
Merge "Check for unattached threads in JVMTI functions"

7 years agoRemove unreachable code in DexLocationToOdexFilename.
Richard Uhler [Mon, 27 Mar 2017 15:53:39 +0000 (16:53 +0100)]
Remove unreachable code in DexLocationToOdexFilename.

Test: test-art-host
Change-Id: I855a58e18fba66555576cc663f4c0631b9dc4ac6

7 years agoMerge "Revert "Improve user-friendliness of art script."" am: 7a0ab7862e
Orion Hodson [Mon, 27 Mar 2017 15:01:21 +0000 (15:01 +0000)]
Merge "Revert "Improve user-friendliness of art script."" am: 7a0ab7862e
am: 589dd7b9ec

Change-Id: Idc6f0c2192bcdedb9dcdb637fa977a8e452c4962

7 years agoMerge "Revert "Improve user-friendliness of art script.""
Orion Hodson [Mon, 27 Mar 2017 14:58:50 +0000 (14:58 +0000)]
Merge "Revert "Improve user-friendliness of art script.""
am: 7a0ab7862e

Change-Id: I164607804909655fa17f9f1a428ede8f28420888

7 years agoMerge "Revert "Improve user-friendliness of art script.""
Orion Hodson [Mon, 27 Mar 2017 14:54:52 +0000 (14:54 +0000)]
Merge "Revert "Improve user-friendliness of art script.""

7 years agoRevert "Improve user-friendliness of art script."
Orion Hodson [Mon, 27 Mar 2017 14:44:43 +0000 (14:44 +0000)]
Revert "Improve user-friendliness of art script."

Breaks jdwp test on device.

This reverts commit 35710a024c487c9e12a9a3ad72f22b10056e1a82.

Change-Id: Ib693e8588eef297495c1d55e4f55cd2ec8ef2bf3

7 years agoMake data dependency around HDeoptimize correct.
Nicolas Geoffray [Thu, 23 Mar 2017 14:37:26 +0000 (14:37 +0000)]
Make data dependency around HDeoptimize correct.

We use HDeoptimize in a few places, but when it comes to data
dependency we either:
- don't have any (BCE, CHA), in which case we should make sure no
  code that the deoptimzation guards moves before the HDeoptimize
- have one on the receiver (inline cache), in which case we can
  update the dominated users with the HDeoptimize to get the data
  dependency correct.

bug:35661819
bug:36371709
test: 644-checker-deopt
Change-Id: I4820c6710b06939e7f5a59606971693e995fb958

7 years agoMerge "Initialize art_method_ in HGraph." am: 2bb8988ed0
Nicolas Geoffray [Mon, 27 Mar 2017 13:57:46 +0000 (13:57 +0000)]
Merge "Initialize art_method_ in HGraph." am: 2bb8988ed0
am: b1b4e9d856

Change-Id: Iec92d1ae9c2a6eaa98b463e87a3d35d71561ed2a

7 years agoMerge "Initialize art_method_ in HGraph."
Nicolas Geoffray [Mon, 27 Mar 2017 13:54:46 +0000 (13:54 +0000)]
Merge "Initialize art_method_ in HGraph."
am: 2bb8988ed0

Change-Id: I5318504c752d573e5b51d9e37f4961736011c485

7 years agoMerge "Initialize art_method_ in HGraph."
Treehugger Robot [Mon, 27 Mar 2017 13:50:43 +0000 (13:50 +0000)]
Merge "Initialize art_method_ in HGraph."

7 years agoInitialize art_method_ in HGraph.
Nicolas Geoffray [Mon, 27 Mar 2017 11:56:16 +0000 (12:56 +0100)]
Initialize art_method_ in HGraph.

Spotted by Ivan Maidanski!

Benign as HGraph is allocated on the arena, and arenas
are always zero initialized.

test: test-art-host
Change-Id: Id8abe421e732dcf7a760f118b16b85fe1fac7c78

7 years agoMerge "MIPS64: Improve method entry/exit code" am: 047871f579
Alexey Frunze [Mon, 27 Mar 2017 11:07:08 +0000 (11:07 +0000)]
Merge "MIPS64: Improve method entry/exit code" am: 047871f579
am: 5170825688

Change-Id: Iadfbf972fcfd4f4121f86f9ca3ed404abda8e226

7 years agoMerge "MIPS64: Improve method entry/exit code"
Alexey Frunze [Mon, 27 Mar 2017 11:04:38 +0000 (11:04 +0000)]
Merge "MIPS64: Improve method entry/exit code"
am: 047871f579

Change-Id: I55cfbc77d40db613c0b22a04a3c54e2d3d1c7860

7 years agoMerge ""Revert^6 "CHA for interface method."""" am: 85f884104c
Nicolas Geoffray [Mon, 27 Mar 2017 11:01:37 +0000 (11:01 +0000)]
Merge ""Revert^6 "CHA for interface method."""" am: 85f884104c
am: 04a0b4c206

Change-Id: I8bc88b1c765b851d21d1ad718e66adf72d44dccd

7 years agoMerge "MIPS64: Improve method entry/exit code"
Treehugger Robot [Mon, 27 Mar 2017 10:59:44 +0000 (10:59 +0000)]
Merge "MIPS64: Improve method entry/exit code"

7 years agoMerge ""Revert^6 "CHA for interface method.""""
Nicolas Geoffray [Mon, 27 Mar 2017 10:59:08 +0000 (10:59 +0000)]
Merge ""Revert^6 "CHA for interface method.""""
am: 85f884104c

Change-Id: Ib415717a8e0a8c465908f0e20bdbc968dc0cd58c

7 years agoMerge ""Revert^6 "CHA for interface method.""""
Nicolas Geoffray [Mon, 27 Mar 2017 10:53:39 +0000 (10:53 +0000)]
Merge ""Revert^6 "CHA for interface method.""""

7 years agoMerge "Revert "Revert "Make original dex file be more deduplicated""" am: 7f56a7459f
Alex Light [Mon, 27 Mar 2017 09:42:36 +0000 (09:42 +0000)]
Merge "Revert "Revert "Make original dex file be more deduplicated""" am: 7f56a7459f
am: c3139e8e71

Change-Id: Icab00bc38338cb9ba4c8ce3a8388b05069407b98

7 years agoMerge "Revert "Revert "Make original dex file be more deduplicated"""
Alex Light [Mon, 27 Mar 2017 09:39:36 +0000 (09:39 +0000)]
Merge "Revert "Revert "Make original dex file be more deduplicated"""
am: 7f56a7459f

Change-Id: Ib9aa383f3237ce176fddd12a59095c89ed49e00a

7 years agoMerge "Revert "Revert "Make original dex file be more deduplicated"""
Treehugger Robot [Mon, 27 Mar 2017 09:35:04 +0000 (09:35 +0000)]
Merge "Revert "Revert "Make original dex file be more deduplicated"""

7 years agoMerge "Add 'dist' to gtest targets to avoid jack issues." am: 5a2bb55f47
Nicolas Geoffray [Mon, 27 Mar 2017 09:14:03 +0000 (09:14 +0000)]
Merge "Add 'dist' to gtest targets to avoid jack issues." am: 5a2bb55f47
am: 2f8cad2135

Change-Id: I691ff163fa10c442c1750bbb60b75123cb2f13af

7 years agoMerge "Add 'dist' to gtest targets to avoid jack issues."
Nicolas Geoffray [Mon, 27 Mar 2017 09:11:32 +0000 (09:11 +0000)]
Merge "Add 'dist' to gtest targets to avoid jack issues."
am: 5a2bb55f47

Change-Id: Ic1ccf595189a9771c290199e0ebcc48d46bbadbc

7 years agoMerge "Add 'dist' to gtest targets to avoid jack issues."
Nicolas Geoffray [Mon, 27 Mar 2017 09:08:04 +0000 (09:08 +0000)]
Merge "Add 'dist' to gtest targets to avoid jack issues."

7 years agoAdd 'dist' to gtest targets to avoid jack issues.
Nicolas Geoffray [Mon, 27 Mar 2017 09:06:14 +0000 (10:06 +0100)]
Add 'dist' to gtest targets to avoid jack issues.

Change-Id: Ibde8ba3e64817859b2bd61e575ea45057c96cd8e

7 years agoMerge "ARM: Reduce the number of branches generated for HCondition and HSelect" am...
Nicolas Geoffray [Mon, 27 Mar 2017 08:18:30 +0000 (08:18 +0000)]
Merge "ARM: Reduce the number of branches generated for HCondition and HSelect" am: 41b67fb85a
am: e8826d7a09

Change-Id: I75ed6b66d5338d925793b3436ad60320bcde192a

7 years agoMerge "ARM: Improve the code generated for HInstanceOf" am: 6a2d5960da
Nicolas Geoffray [Mon, 27 Mar 2017 08:15:48 +0000 (08:15 +0000)]
Merge "ARM: Improve the code generated for HInstanceOf" am: 6a2d5960da
am: a200cd4746

Change-Id: I5e98498655e0d6952cc3121bbd9cc43833be8e63

7 years agoMerge "ARM: Reduce the number of branches generated for HCondition and HSelect"
Nicolas Geoffray [Mon, 27 Mar 2017 08:15:29 +0000 (08:15 +0000)]
Merge "ARM: Reduce the number of branches generated for HCondition and HSelect"
am: 41b67fb85a

Change-Id: I91a175516c969a6b096d8e298aa966af09b99092

7 years agoMerge "Improve user-friendliness of art script." am: ffac46009f
Orion Hodson [Mon, 27 Mar 2017 08:15:28 +0000 (08:15 +0000)]
Merge "Improve user-friendliness of art script." am: ffac46009f
am: 63194d7d0b

Change-Id: I5310af2f5f7d5969c427fd1034f072e9d4da829f

7 years agoMerge "ARM: Improve the code generated for HInstanceOf"
Nicolas Geoffray [Mon, 27 Mar 2017 08:12:47 +0000 (08:12 +0000)]
Merge "ARM: Improve the code generated for HInstanceOf"
am: 6a2d5960da

Change-Id: I5148b628c3133d03cc048796c9106cb956790a2a

7 years agoMerge "Improve user-friendliness of art script."
Orion Hodson [Mon, 27 Mar 2017 08:12:31 +0000 (08:12 +0000)]
Merge "Improve user-friendliness of art script."
am: ffac46009f

Change-Id: I87fda827c77a41f0b9ffd41a7ca9be6f437f22a5

7 years agoMerge "ARM: Reduce the number of branches generated for HCondition and HSelect"
Nicolas Geoffray [Mon, 27 Mar 2017 08:10:13 +0000 (08:10 +0000)]
Merge "ARM: Reduce the number of branches generated for HCondition and HSelect"

7 years agoMerge "ARM: Improve the code generated for HInstanceOf"
Nicolas Geoffray [Mon, 27 Mar 2017 08:09:43 +0000 (08:09 +0000)]
Merge "ARM: Improve the code generated for HInstanceOf"

7 years agoMerge "Improve user-friendliness of art script."
Orion Hodson [Mon, 27 Mar 2017 08:08:53 +0000 (08:08 +0000)]
Merge "Improve user-friendliness of art script."

7 years agoMerge "Improvements in the Inliner." am: 624dc59e7d
Nicolas Geoffray [Mon, 27 Mar 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Improvements in the Inliner." am: 624dc59e7d
am: cfa9e52e01

Change-Id: I311a885630bd4069bc8eaa6275b8f10f9a4e16ff

7 years ago"Revert^6 "CHA for interface method."""
Nicolas Geoffray [Mon, 27 Mar 2017 08:00:18 +0000 (08:00 +0000)]
"Revert^6 "CHA for interface method."""

Update test expectations for CHA tests flaking on no-dex2oat.

bug:36344221

This reverts commit 27ef25f084017421ca05508208f436b5fc11df73.

Change-Id: Ie92adc7a2ec3b3081a1c57d71f8c89247e58cd46

7 years agoMerge "Improvements in the Inliner."
Nicolas Geoffray [Mon, 27 Mar 2017 08:01:28 +0000 (08:01 +0000)]
Merge "Improvements in the Inliner."
am: 624dc59e7d

Change-Id: Id533aa18c304da596590ab8c8759d83d8a0865c5

7 years agoMerge "Improvements in the Inliner."
Nicolas Geoffray [Mon, 27 Mar 2017 07:57:46 +0000 (07:57 +0000)]
Merge "Improvements in the Inliner."

7 years agoMerge "Makefile cleanup/fix after refactoring." am: 5b8f4e952f
Nicolas Geoffray [Sat, 25 Mar 2017 14:16:38 +0000 (14:16 +0000)]
Merge "Makefile cleanup/fix after refactoring." am: 5b8f4e952f
am: 062ff613d6

Change-Id: Iaa639676ec5d42e778333650fd4ac6d9f43beef5

7 years agoMerge "Makefile cleanup/fix after refactoring."
Nicolas Geoffray [Sat, 25 Mar 2017 14:14:07 +0000 (14:14 +0000)]
Merge "Makefile cleanup/fix after refactoring."
am: 5b8f4e952f

Change-Id: I8901156699fa2e3d8f4d22b89cff85a5249ea330

7 years agoMerge "Makefile cleanup/fix after refactoring."
Nicolas Geoffray [Sat, 25 Mar 2017 14:10:03 +0000 (14:10 +0000)]
Merge "Makefile cleanup/fix after refactoring."

7 years agoMakefile cleanup/fix after refactoring.
Nicolas Geoffray [Sat, 25 Mar 2017 14:05:28 +0000 (14:05 +0000)]
Makefile cleanup/fix after refactoring.

1) Put hprof-conf in ART_TEST_HOST_RUN_TEST_DEPENDENCIES
2) Remove duplicated code.

Change-Id: I11d141a13e94292f5a2bfefe1016be39aaece019

7 years agoMerge "Fix issue with Android.run-test.mk" am: 8b83ba5d53
Nicolas Geoffray [Sat, 25 Mar 2017 12:51:32 +0000 (12:51 +0000)]
Merge "Fix issue with Android.run-test.mk" am: 8b83ba5d53
am: 42b079c9a3

Change-Id: I0b89e53eb7aa3c5ecad4efc48cfc81fd9ac5c1eb

7 years agoMerge "Fix issue with Android.run-test.mk"
Nicolas Geoffray [Sat, 25 Mar 2017 12:49:02 +0000 (12:49 +0000)]
Merge "Fix issue with Android.run-test.mk"
am: 8b83ba5d53

Change-Id: I0e93a0ff7cde618b7acaf17ba676f68203fac155

7 years agoMerge "Fix issue with Android.run-test.mk"
Nicolas Geoffray [Sat, 25 Mar 2017 12:45:22 +0000 (12:45 +0000)]
Merge "Fix issue with Android.run-test.mk"

7 years agoTestrunner: Temporarily fix long Dex File name issue
Shubham Ajmera [Fri, 24 Mar 2017 21:44:10 +0000 (14:44 -0700)]
Testrunner: Temporarily fix long Dex File name issue

Instead of passing long test names, it passes a directory with shorter name.

Bug: 36039166
Test: TMPDIR=/usr/local/google/home/shubhamajmera/aosp/tmp1 \
      TEMP=/usr/local/google/home/shubhamajmera/aosp/tmp1 \
      TMP=/usr/local/google/home/shubhamajmera/aosp/tmp1 \
      ./art/test.py \
      -t test-art-host-run-test-debug-prebuild-interpreter-relocate-npatchoat-ntrace-cms-checkjni-picimage-npictest-ndebuggable-201-built-in-except-detail-messages64 \
      -r

Change-Id: Id361e130301a23cd0c0d10a16cdd0dc48882c22b

7 years agoCheck for unattached threads in JVMTI functions
Alex Light [Fri, 24 Mar 2017 21:22:56 +0000 (14:22 -0700)]
Check for unattached threads in JVMTI functions

Calling the JVMTI functions with an unattached thread is required to
return JVMTI_ERROR_UNATTACHED_THREAD.

Test: ./test.py --host -j40
Bug: 36576873
Change-Id: I312b4e0a5e5fb66961f6efcc36d9480626c3461f

7 years agoFix issue with Android.run-test.mk
Alex Light [Fri, 24 Mar 2017 22:23:27 +0000 (15:23 -0700)]
Fix issue with Android.run-test.mk

We were clearing 2 makefile variables that was needed for our
buildbots to run correctly.

Test: m clean && ./test.py --target -j8
Test: m clean && ./test.py --host -j40
Change-Id: Ic15ccf6701bf12b7ee5aeddf940e0c343677c8b0

7 years agoRevert "Revert "Make original dex file be more deduplicated""
Alex Light [Fri, 24 Mar 2017 15:21:34 +0000 (15:21 +0000)]
Revert "Revert "Make original dex file be more deduplicated""

This reverts commit a7c04c4fe6623985ba2d0cca942d5e1e584f4358.

Reason for revert: Issue with target buildbots was fixed

Test: m clean && ./test.py --target -j8
Bug: 31455788

Change-Id: If00ef9433a9308810a40ea4e0d809987c934cef8

7 years agoMerge "Move backtrace logic to backtrace_helper.h" am: ae60e48f10
Mathieu Chartier [Fri, 24 Mar 2017 18:58:55 +0000 (18:58 +0000)]
Merge "Move backtrace logic to backtrace_helper.h" am: ae60e48f10
am: 8246c857e7

Change-Id: I434a32f825af5dc8be86745f2edf0180add85a8b

7 years agoMerge "Move backtrace logic to backtrace_helper.h"
Mathieu Chartier [Fri, 24 Mar 2017 18:56:55 +0000 (18:56 +0000)]
Merge "Move backtrace logic to backtrace_helper.h"
am: ae60e48f10

Change-Id: Ic4d3edd9e02bcaf95f00a90561f62497e2fb02a5