OSDN Git Service

android-x86/art.git
7 years agoMerge "Remove boolean arguments from NewLibrary()" am: bc1f469af0
Colin Cross [Wed, 14 Dec 2016 18:46:23 +0000 (18:46 +0000)]
Merge "Remove boolean arguments from NewLibrary()" am: bc1f469af0
am: c4a8aacbf2

Change-Id: I882b7fdc05a470440817c640871c9363637b2c47

7 years agoMerge "Remove boolean arguments from NewLibrary()"
Colin Cross [Wed, 14 Dec 2016 18:39:52 +0000 (18:39 +0000)]
Merge "Remove boolean arguments from NewLibrary()"
am: bc1f469af0

Change-Id: I771aeb2010658b0215b955ef862ff495e548ca56

7 years agoMerge "Remove boolean arguments from NewLibrary()"
Treehugger Robot [Wed, 14 Dec 2016 18:32:21 +0000 (18:32 +0000)]
Merge "Remove boolean arguments from NewLibrary()"

7 years agoMerge "Add exclusion for Reference.clear and reference processing" am: 816f78479d
Mathieu Chartier [Wed, 14 Dec 2016 17:44:03 +0000 (17:44 +0000)]
Merge "Add exclusion for Reference.clear and reference processing" am: 816f78479d
am: e58aab804a

Change-Id: I5d2a71766fee021652f2c88f171fc66e05462e01

7 years agoMerge "Don't re-read referent in ReferenceProcessor::GetReferent" am: c9da0f8bb0
Mathieu Chartier [Wed, 14 Dec 2016 17:43:43 +0000 (17:43 +0000)]
Merge "Don't re-read referent in ReferenceProcessor::GetReferent" am: c9da0f8bb0
am: 67653d8c0d

Change-Id: I3ec834e52a1cef1770a48f58c105de651f1c8ede

7 years agoMerge "Add exclusion for Reference.clear and reference processing"
Mathieu Chartier [Wed, 14 Dec 2016 17:37:46 +0000 (17:37 +0000)]
Merge "Add exclusion for Reference.clear and reference processing"
am: 816f78479d

Change-Id: Ie3332a0c4191e798035e83964b82016bf2953873

7 years agoMerge "Don't re-read referent in ReferenceProcessor::GetReferent"
Mathieu Chartier [Wed, 14 Dec 2016 17:37:21 +0000 (17:37 +0000)]
Merge "Don't re-read referent in ReferenceProcessor::GetReferent"
am: c9da0f8bb0

Change-Id: I727e7d180c72a8c9547e0bddd505df5b2cffd6d5

7 years agoMerge "Add exclusion for Reference.clear and reference processing"
Mathieu Chartier [Wed, 14 Dec 2016 17:30:23 +0000 (17:30 +0000)]
Merge "Add exclusion for Reference.clear and reference processing"

7 years agoMerge "Don't re-read referent in ReferenceProcessor::GetReferent"
Mathieu Chartier [Wed, 14 Dec 2016 17:30:07 +0000 (17:30 +0000)]
Merge "Don't re-read referent in ReferenceProcessor::GetReferent"

7 years agoMerge "Fix AssemblerMIPS64Test.LongBalc() running out of memory." am: afca9306a6
Vladimir Marko [Wed, 14 Dec 2016 16:02:07 +0000 (16:02 +0000)]
Merge "Fix AssemblerMIPS64Test.LongBalc() running out of memory." am: afca9306a6
am: 9d51ab357e

Change-Id: I11ac23b97f2d90607dda222ea5f1ee64db21e2c7

7 years agoMerge "Fix AssemblerMIPS64Test.LongBalc() running out of memory."
Vladimir Marko [Wed, 14 Dec 2016 15:55:06 +0000 (15:55 +0000)]
Merge "Fix AssemblerMIPS64Test.LongBalc() running out of memory."
am: afca9306a6

Change-Id: I1268e080ff3f3d1fdbdd79d89c4d5730d09bf079

7 years agoMerge "Fix AssemblerMIPS64Test.LongBalc() running out of memory."
Treehugger Robot [Wed, 14 Dec 2016 15:48:29 +0000 (15:48 +0000)]
Merge "Fix AssemblerMIPS64Test.LongBalc() running out of memory."

7 years agoFix AssemblerMIPS64Test.LongBalc() running out of memory.
Vladimir Marko [Wed, 14 Dec 2016 14:18:22 +0000 (14:18 +0000)]
Fix AssemblerMIPS64Test.LongBalc() running out of memory.

Pre-allocate the necessary buffer because the reallocation
strategy doesn't work well for a test of this size.

Test: m test-art-host-gtest-assembler_mips64_test
Change-Id: I16bc75f0ae83a62e5f3ed2cd8228dd40f0eb9524

7 years agoMerge "ARM: Fix breaking changes from recent VIXL update." am: b73e659be3
Nicolas Geoffray [Wed, 14 Dec 2016 14:01:32 +0000 (14:01 +0000)]
Merge "ARM: Fix breaking changes from recent VIXL update." am: b73e659be3
am: ad0e67a6de

Change-Id: I206a75472d807c800abfde8448706686de20d8a9

7 years agoMerge "ARM: Fix breaking changes from recent VIXL update."
Nicolas Geoffray [Wed, 14 Dec 2016 13:55:06 +0000 (13:55 +0000)]
Merge "ARM: Fix breaking changes from recent VIXL update."
am: b73e659be3

Change-Id: Id83c34cb94aa4785c070a35d30e1d4f45aa4d236

7 years agoMerge "ARM: Fix breaking changes from recent VIXL update."
Nicolas Geoffray [Wed, 14 Dec 2016 13:43:48 +0000 (13:43 +0000)]
Merge "ARM: Fix breaking changes from recent VIXL update."

7 years agoMerge "Implement VisitShouldDeoptimizeFlag for MIPS/MIPS64" am: 3f92bdea52
Goran Jakovljevic [Wed, 14 Dec 2016 12:18:24 +0000 (12:18 +0000)]
Merge "Implement VisitShouldDeoptimizeFlag for MIPS/MIPS64" am: 3f92bdea52
am: 776b293eaf

Change-Id: Ibd9927c3a62a6431a33c37462243bae7c8ee0f48

7 years agoMerge "Implement VisitShouldDeoptimizeFlag for MIPS/MIPS64"
Goran Jakovljevic [Wed, 14 Dec 2016 12:11:24 +0000 (12:11 +0000)]
Merge "Implement VisitShouldDeoptimizeFlag for MIPS/MIPS64"
am: 3f92bdea52

Change-Id: Ia2f5cc7e7fed0fa78105befa7e781bafada6c7ca

7 years agoMerge "Implement VisitShouldDeoptimizeFlag for MIPS/MIPS64"
Treehugger Robot [Wed, 14 Dec 2016 12:00:51 +0000 (12:00 +0000)]
Merge "Implement VisitShouldDeoptimizeFlag for MIPS/MIPS64"

7 years agoMerge "MIPS64: Improve method invocation." am: b70b66e701
Alexey Frunze [Wed, 14 Dec 2016 11:57:23 +0000 (11:57 +0000)]
Merge "MIPS64: Improve method invocation." am: b70b66e701
am: c9b368f479

Change-Id: Icfa12b7c567f12be1128becbd2f01d9e175419a7

7 years agoMerge "MIPS64: Improve method invocation."
Alexey Frunze [Wed, 14 Dec 2016 11:51:23 +0000 (11:51 +0000)]
Merge "MIPS64: Improve method invocation."
am: b70b66e701

Change-Id: Ie5cc97825258886bac942565e420f6d608433fce

7 years agoMerge "MIPS64: Improve method invocation."
Treehugger Robot [Wed, 14 Dec 2016 11:45:32 +0000 (11:45 +0000)]
Merge "MIPS64: Improve method invocation."

7 years agoMerge "Support GVN for HLoadClass::LoadKind::kJitTableAddress." am: 001e1c1202
Nicolas Geoffray [Wed, 14 Dec 2016 09:33:45 +0000 (09:33 +0000)]
Merge "Support GVN for HLoadClass::LoadKind::kJitTableAddress." am: 001e1c1202
am: 7ccdebe66b

Change-Id: Ic2253f50f3955c49845cab189c91564b717b4375

7 years agoMerge "Support GVN for HLoadClass::LoadKind::kJitTableAddress."
Nicolas Geoffray [Wed, 14 Dec 2016 09:27:15 +0000 (09:27 +0000)]
Merge "Support GVN for HLoadClass::LoadKind::kJitTableAddress."
am: 001e1c1202

Change-Id: I14e454cf6f5adbda61291af3d481f8c993743aff

7 years agoMerge "Handle primitive types in VerifierTypes::AddAssignability." am: dfc453b2ab
Nicolas Geoffray [Wed, 14 Dec 2016 09:27:14 +0000 (09:27 +0000)]
Merge "Handle primitive types in VerifierTypes::AddAssignability." am: dfc453b2ab
am: a22c7440ea

Change-Id: Iab729af1ac94abeb3519009776d11f72d7d3a4b2

7 years agoImplement VisitShouldDeoptimizeFlag for MIPS/MIPS64
Goran Jakovljevic [Mon, 5 Dec 2016 15:31:55 +0000 (16:31 +0100)]
Implement VisitShouldDeoptimizeFlag for MIPS/MIPS64

This is follow-up change for I18bf716a601b6413b46312e925a6ad9e4008efa4.

Test: mma ART_TEST_JIT=true test-art-target-run-test-jit on CI20 and QEMU

Change-Id: I750814ae740a4549f1a2af11be7ae4318ae26a2f

7 years agoMerge "Support GVN for HLoadClass::LoadKind::kJitTableAddress."
Nicolas Geoffray [Wed, 14 Dec 2016 09:21:59 +0000 (09:21 +0000)]
Merge "Support GVN for HLoadClass::LoadKind::kJitTableAddress."

7 years agoMerge "Handle primitive types in VerifierTypes::AddAssignability."
Nicolas Geoffray [Wed, 14 Dec 2016 09:20:16 +0000 (09:20 +0000)]
Merge "Handle primitive types in VerifierTypes::AddAssignability."
am: dfc453b2ab

Change-Id: I087fd12b6215a92b5c8180c239303d2a71999137

7 years agoMerge "Handle primitive types in VerifierTypes::AddAssignability."
Nicolas Geoffray [Wed, 14 Dec 2016 09:15:05 +0000 (09:15 +0000)]
Merge "Handle primitive types in VerifierTypes::AddAssignability."

7 years agoMerge "ART: Make switch back-edge suspension point consistent" am: a248587487
Andreas Gampe [Wed, 14 Dec 2016 01:12:18 +0000 (01:12 +0000)]
Merge "ART: Make switch back-edge suspension point consistent" am: a248587487
am: 006fa3a9e6

Change-Id: Id4dabe365d6b0ec42bc7c33ccc2e490517416521

7 years agoMerge "ART: Make switch back-edge suspension point consistent"
Andreas Gampe [Wed, 14 Dec 2016 01:06:17 +0000 (01:06 +0000)]
Merge "ART: Make switch back-edge suspension point consistent"
am: a248587487

Change-Id: I8eb60834f9f1247860c97a740294020eabc27add

7 years agoMerge "ART: Make switch back-edge suspension point consistent"
Treehugger Robot [Wed, 14 Dec 2016 00:54:45 +0000 (00:54 +0000)]
Merge "ART: Make switch back-edge suspension point consistent"

7 years agoAdd exclusion for Reference.clear and reference processing
Mathieu Chartier [Tue, 13 Dec 2016 22:44:33 +0000 (14:44 -0800)]
Add exclusion for Reference.clear and reference processing

Prevents race conditions like unclearing cleared references or
calling IsMarkedHeapReference on null references.

Bug: 33389022

Test: test-art-host

Change-Id: Iee83b76d84453e929172f1a83f284aa4910e126c

7 years agoART: Make switch back-edge suspension point consistent
Andreas Gampe [Tue, 13 Dec 2016 22:43:58 +0000 (14:43 -0800)]
ART: Make switch back-edge suspension point consistent

Both compiled code and mterp attribute a back-edge suspend point
to the target. Make switch consistent by proactively updating
the frame's dex PC in that case.

Add another macro for reuse.

Bug: 31684812
Test: m test-art-host-run-test-911-get-stack-trace
Test: m ART_TEST_INTERPRETER=true ART_TEST_JIT=true ART_TEST_TRACE=true test-art-host
Change-Id: I9969cc4ffbc34cf1d8849938a1cd7e2c9aec462d

7 years agoSupport GVN for HLoadClass::LoadKind::kJitTableAddress.
Nicolas Geoffray [Tue, 13 Dec 2016 13:43:31 +0000 (13:43 +0000)]
Support GVN for HLoadClass::LoadKind::kJitTableAddress.

Fixes performance regressions seen in eg Dhrystone.

Also add comment on why a class may not be found when sharpening.

Test: manual Dhrystone run, performance recovers
Test: ART_TEST_JIT=true test-art-host-run-test-jit
Change-Id: I8e879f1c390f83e8bc930f343beb7b4a41c2f190

7 years agoMIPS64: Improve method invocation.
Alexey Frunze [Thu, 1 Dec 2016 03:19:55 +0000 (19:19 -0800)]
MIPS64: Improve method invocation.

Improvements include:
- support for all kinds of method loads and static/direct calls
- 32-bit and 64-bit literals for the above and future work
- shorter instruction sequences for recursive static/direct calls
Also:
- include the MIPS64 dinsu instruction (missed earlier) and minor
  clean-up in the disassembler
- properly prefix constant names with 'k' in relative patcher tests

Test: test-art-host-gtest
Test: booted MIPS64 (with 2nd arch MIPS32R6) in QEMU
Test: "make -j1 ART_TEST_DEFAULT_COMPILER=false ART_TEST_OPTIMIZING=true
       ART_TEST_INTERPRETER=false ART_TEST_JIT=false
       ART_TEST_PIC_TEST=true test-art-target-run-test64"

Change-Id: I19876fa5316b68531af7dfddfce90d2068433116

7 years agoMerge "ART: Clean up utils.h" am: d812f78297
Andreas Gampe [Tue, 13 Dec 2016 22:07:07 +0000 (22:07 +0000)]
Merge "ART: Clean up utils.h" am: d812f78297
am: 3539cb7018

Change-Id: Ib4ca51475998b2aa8b4392287f425f633ce5cd68

7 years agoMerge "ART: Clean up utils.h"
Andreas Gampe [Tue, 13 Dec 2016 22:00:36 +0000 (22:00 +0000)]
Merge "ART: Clean up utils.h"
am: d812f78297

Change-Id: I5bbe18362ccd1b13413efe5d346b39436e739820

7 years agoMerge "ART: Clean up utils.h"
Treehugger Robot [Tue, 13 Dec 2016 21:54:10 +0000 (21:54 +0000)]
Merge "ART: Clean up utils.h"

7 years agoRemove boolean arguments from NewLibrary()
Colin Cross [Fri, 9 Dec 2016 22:47:29 +0000 (14:47 -0800)]
Remove boolean arguments from NewLibrary()

NewLibrary is going to be used for header only libraries.  Instead
of adding more boolean arguments, replace the existing ones with
BuildOnlyStatic and BuildOnlyShared calls on the libraryDecorator
returned by NewLibrary.

Test: m -j, compare build.ninja
Change-Id: I832627938f3fbc8cc1565c695048a5b5c3553090

7 years agoDon't re-read referent in ReferenceProcessor::GetReferent
Mathieu Chartier [Tue, 13 Dec 2016 19:46:28 +0000 (11:46 -0800)]
Don't re-read referent in ReferenceProcessor::GetReferent

Re-reading has the issue that it may read a null value after already
having done the null check. Using a cached value prevents this from
happening and causing DCHECK failures.

Added a related stress test.

Bug: 33569625
Bug: 33389022

Test: test-art-host

Change-Id: Ic42d540e035d41ac6e5b01762f9510cd6632b28c

7 years agoMerge changes Iac3db17f,I4221ef81 am: 0955e34843
Andreas Gampe [Tue, 13 Dec 2016 20:23:18 +0000 (20:23 +0000)]
Merge changes Iac3db17f,I4221ef81 am: 0955e34843
am: 4ed9f2295a

Change-Id: I15e9af44cd60275afdd8491605a21555fdefc423

7 years agoART: Fix stack trace location reporting am: 2340e3f3aa
Andreas Gampe [Tue, 13 Dec 2016 20:23:10 +0000 (20:23 +0000)]
ART: Fix stack trace location reporting am: 2340e3f3aa
am: ed29d84356

Change-Id: Ie7b39b6b53c09cd086c2216744f49005ae7fa355

7 years agoART: Rewrite test 911 stack trace reporting am: ceafe35513
Andreas Gampe [Tue, 13 Dec 2016 20:23:00 +0000 (20:23 +0000)]
ART: Rewrite test 911 stack trace reporting am: ceafe35513
am: f0d04b7c87

Change-Id: I21f88f10a79c02e897850d1d944742ecbd4c1cda

7 years agoMerge changes Iac3db17f,I4221ef81
Andreas Gampe [Tue, 13 Dec 2016 20:16:10 +0000 (20:16 +0000)]
Merge changes Iac3db17f,I4221ef81
am: 0955e34843

Change-Id: Ic30935bfd9aff2ac04fd42ac58932170d94266f5

7 years agoART: Fix stack trace location reporting
Andreas Gampe [Tue, 13 Dec 2016 20:16:08 +0000 (20:16 +0000)]
ART: Fix stack trace location reporting
am: 2340e3f3aa

Change-Id: I481b7d5b2840a0c72507f61743f325a64572945a

7 years agoART: Rewrite test 911 stack trace reporting
Andreas Gampe [Tue, 13 Dec 2016 20:16:00 +0000 (20:16 +0000)]
ART: Rewrite test 911 stack trace reporting
am: ceafe35513

Change-Id: I8b81ba40224fc36b045bddb92c82a619ac62b74a

7 years agoMerge changes Iac3db17f,I4221ef81
Treehugger Robot [Tue, 13 Dec 2016 20:11:26 +0000 (20:11 +0000)]
Merge changes Iac3db17f,I4221ef81

* changes:
  ART: Fix stack trace location reporting
  ART: Rewrite test 911 stack trace reporting

7 years agoMerge "Address some review comments" am: 017c55c120
Mathieu Chartier [Tue, 13 Dec 2016 20:09:30 +0000 (20:09 +0000)]
Merge "Address some review comments" am: 017c55c120
am: ed9771b350

Change-Id: I4cdb6b515f5d66c1f7b07c7492ca91ed758f24d2

7 years agoMerge "Address some review comments"
Mathieu Chartier [Tue, 13 Dec 2016 20:02:29 +0000 (20:02 +0000)]
Merge "Address some review comments"
am: 017c55c120

Change-Id: Iafd709eacf9a986452179b5661c70b150b17e3f1

7 years agoMerge "Address some review comments"
Mathieu Chartier [Tue, 13 Dec 2016 19:55:45 +0000 (19:55 +0000)]
Merge "Address some review comments"

7 years agoART: Clean up utils.h
Andreas Gampe [Mon, 12 Dec 2016 22:28:21 +0000 (14:28 -0800)]
ART: Clean up utils.h

Remove functionality provided by libbase. Move some single-use
functions to their respective users.

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

7 years agoMerge "Prune uses library classes even without profile" am: 319261e13a
Mathieu Chartier [Tue, 13 Dec 2016 19:38:27 +0000 (19:38 +0000)]
Merge "Prune uses library classes even without profile" am: 319261e13a
am: b4708114b6

Change-Id: Ie199cff46d2bdb88350dedb87ad1c8210af325a4

7 years agoMerge "Prune uses library classes even without profile"
Mathieu Chartier [Tue, 13 Dec 2016 19:31:28 +0000 (19:31 +0000)]
Merge "Prune uses library classes even without profile"
am: 319261e13a

Change-Id: I372d44be97b4a94296ebf52d5f597478a48669a8

7 years agoMerge "Prune uses library classes even without profile"
Mathieu Chartier [Tue, 13 Dec 2016 19:24:35 +0000 (19:24 +0000)]
Merge "Prune uses library classes even without profile"

7 years agoAddress some review comments
Mathieu Chartier [Mon, 12 Dec 2016 19:06:59 +0000 (11:06 -0800)]
Address some review comments

Addressed comments in dex cache and class table. Added class table
test.

Test: mm test-art-host-gtest-class_table_test -j20

Change-Id: I3ec0282247187acb1ec7af25b309501f001a1c3e

7 years agoMerge "Fix CC DCHECK failure in 152-gc-and-run-finalization." am: aa2657d6d9
Hiroshi Yamauchi [Tue, 13 Dec 2016 18:09:22 +0000 (18:09 +0000)]
Merge "Fix CC DCHECK failure in 152-gc-and-run-finalization." am: aa2657d6d9
am: 0077c964c0

Change-Id: I0394bb7b76f2b0562004e6cb891106a6a99078db

7 years agoMerge "Fix CC DCHECK failure in 152-gc-and-run-finalization."
Hiroshi Yamauchi [Tue, 13 Dec 2016 18:02:51 +0000 (18:02 +0000)]
Merge "Fix CC DCHECK failure in 152-gc-and-run-finalization."
am: aa2657d6d9

Change-Id: I71f78805750b4c695eeb829c56c7ff2b86fd67ad

7 years agoMerge "Fix CC DCHECK failure in 152-gc-and-run-finalization."
Hiroshi Yamauchi [Tue, 13 Dec 2016 17:55:33 +0000 (17:55 +0000)]
Merge "Fix CC DCHECK failure in 152-gc-and-run-finalization."

7 years agoMerge "Remove obsolete DeduplicateDexCacheAddressLiteral()." am: ea63e4d1c3
Vladimir Marko [Tue, 13 Dec 2016 15:53:46 +0000 (15:53 +0000)]
Merge "Remove obsolete DeduplicateDexCacheAddressLiteral()." am: ea63e4d1c3
am: 7cad34ad64

Change-Id: I73a441897eee756837c3686868a9323356af2bbe

7 years agoMerge "Remove obsolete DeduplicateDexCacheAddressLiteral()."
Vladimir Marko [Tue, 13 Dec 2016 15:46:45 +0000 (15:46 +0000)]
Merge "Remove obsolete DeduplicateDexCacheAddressLiteral()."
am: ea63e4d1c3

Change-Id: Icdfcecbcfe20e24e04c220c308407efbf163cfee

7 years agoMerge "Remove obsolete DeduplicateDexCacheAddressLiteral()."
Vladimir Marko [Tue, 13 Dec 2016 15:37:09 +0000 (15:37 +0000)]
Merge "Remove obsolete DeduplicateDexCacheAddressLiteral()."

7 years agoHandle primitive types in VerifierTypes::AddAssignability.
Nicolas Geoffray [Mon, 12 Dec 2016 13:07:07 +0000 (13:07 +0000)]
Handle primitive types in VerifierTypes::AddAssignability.

The dex2dex compiler might indirectly call it with arrays
of primitives.

Also remove dead APUT_OBJECT optimization in VerifiedMethod.
It was added for optimizing Quick:
https://googleplex-android-review.googlesource.com/#/c/371193

Commit hash:
a9a8254c920ce8e22210abfc16c9842ce0aea28f

But Quick is gone.

Test: 630-safecast-array
bug: 334987503254680732546608

Change-Id: Icfd3f8d915bfe225f05dbec42f9ba25dc1243fdc

7 years agoMerge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test...
Nicolas Geoffray [Tue, 13 Dec 2016 14:13:10 +0000 (14:13 +0000)]
Merge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test." am: 831cb268e0
am: 79f52245c0

Change-Id: I291081799e9ba0d26c21e0bb7b84e14dd3e6946a

7 years agoMerge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test."
Nicolas Geoffray [Tue, 13 Dec 2016 14:07:10 +0000 (14:07 +0000)]
Merge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test."
am: 831cb268e0

Change-Id: I5aa68f3529c0d4cc37eb050344bc38d77c56b506

7 years agoMerge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test."
Nicolas Geoffray [Tue, 13 Dec 2016 13:57:39 +0000 (13:57 +0000)]
Merge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test."

7 years agoRemove obsolete DeduplicateDexCacheAddressLiteral().
Vladimir Marko [Tue, 13 Dec 2016 13:50:14 +0000 (13:50 +0000)]
Remove obsolete DeduplicateDexCacheAddressLiteral().

Test: Rely on TreeHugger
Bug: 30627598
Change-Id: Ia3c7a1d528f62b730d7ac1cc7b67f21d9ff06c9e

7 years agoMerge "Disable 626-const-class-linking for JIT." am: 1e35a69a44
Vladimir Marko [Tue, 13 Dec 2016 12:53:06 +0000 (12:53 +0000)]
Merge "Disable 626-const-class-linking for JIT." am: 1e35a69a44
am: 7ffb7155dc

Change-Id: Id2114978d3d749d2dddda692186ae13f065fbecb

7 years agoMerge "Disable 626-const-class-linking for JIT."
Vladimir Marko [Tue, 13 Dec 2016 12:46:36 +0000 (12:46 +0000)]
Merge "Disable 626-const-class-linking for JIT."
am: 1e35a69a44

Change-Id: I4bb6ba663767d7a8fb61a4b7c3b55396f648f407

7 years agoMerge "Disable 626-const-class-linking for JIT."
Vladimir Marko [Tue, 13 Dec 2016 12:36:49 +0000 (12:36 +0000)]
Merge "Disable 626-const-class-linking for JIT."

7 years agoMerge "Fix string compression for embedded zero chars." am: 3a0c53f93c
Vladimir Marko [Tue, 13 Dec 2016 12:19:05 +0000 (12:19 +0000)]
Merge "Fix string compression for embedded zero chars." am: 3a0c53f93c
am: c65eecb3db

Change-Id: Ic99fcb0661cc42ffa9ee1b71efd80a3299549a58

7 years agoMerge "Fix string compression for embedded zero chars."
Vladimir Marko [Tue, 13 Dec 2016 12:12:34 +0000 (12:12 +0000)]
Merge "Fix string compression for embedded zero chars."
am: 3a0c53f93c

Change-Id: Iafa28e39957877e329365ed9e7fd991bdd3baee6

7 years agoMerge "Fix string compression for embedded zero chars."
Treehugger Robot [Tue, 13 Dec 2016 12:04:20 +0000 (12:04 +0000)]
Merge "Fix string compression for embedded zero chars."

7 years agoARM: Fix breaking changes from recent VIXL update.
Artem Serov [Tue, 6 Dec 2016 18:13:40 +0000 (18:13 +0000)]
ARM: Fix breaking changes from recent VIXL update.

Test: m test-art-host
Test: m test-art-target
Change-Id: I5c0c38fcd935e97fc94721f645e51251c7a87d39

7 years agoDisable 626-const-class-linking for JIT.
Vladimir Marko [Tue, 13 Dec 2016 10:37:07 +0000 (10:37 +0000)]
Disable 626-const-class-linking for JIT.

Test: m ART_TEST_JIT=true test-art-host; test skipped.
Bug: 33567581
Change-Id: Ib530a27b14d918bc8a24f85473c8705f023280b0

7 years agoFix string compression for embedded zero chars.
Vladimir Marko [Fri, 9 Dec 2016 14:01:02 +0000 (14:01 +0000)]
Fix string compression for embedded zero chars.

Treat embedded zero character as non-ASCII.

Test: m test-art-host
Test: m test-art-host with string compression enabled.
Bug: 31040547
Change-Id: Iea6e92f89d424953814953ba27f1c7a991589c65

7 years agoMerge "Revert "Revert "Add kJitTableAddress for HLoadClass.""" am: fb678bfaad
Nicolas Geoffray [Tue, 13 Dec 2016 09:50:26 +0000 (09:50 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass.""" am: fb678bfaad
am: 44f89e9d66

Change-Id: I6747d99600d4e330390450d16f1d527ae13161fe

7 years agoMerge "Revert "Revert "Add kJitTableAddress for HLoadClass."""
Nicolas Geoffray [Tue, 13 Dec 2016 09:43:56 +0000 (09:43 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass."""
am: fb678bfaad

Change-Id: I35eb743806ca582d729ddbe8a95719a4959d8599

7 years agoMerge "Revert "Revert "Add kJitTableAddress for HLoadClass."""
Nicolas Geoffray [Tue, 13 Dec 2016 09:34:11 +0000 (09:34 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass."""

7 years agoART: Fix stack trace location reporting
Andreas Gampe [Tue, 13 Dec 2016 03:37:19 +0000 (19:37 -0800)]
ART: Fix stack trace location reporting

The frame info contains the location, not the line number. Add
location to output.

Bug: 31684812
Test: m test-art-host-run-test-911-get-stack-trace
Change-Id: Iac3db17fb32e9a7f83ca9f3614dee0d16fd2120d

7 years agoART: Rewrite test 911 stack trace reporting
Andreas Gampe [Tue, 13 Dec 2016 02:49:33 +0000 (18:49 -0800)]
ART: Rewrite test 911 stack trace reporting

Return an array of arrays, which is easier to extend and doesn't
have the tight coupling of a collapsed array.

Bug: 31684812
Test: m test-art-host-run-test-911-get-stack-trace
Change-Id: I4221ef8135c7b76a50c1af25f6328f447cf40ab2

7 years agoMerge "ART: Add missing space in log line" am: 7c73bf3518
Andreas Gampe [Mon, 12 Dec 2016 23:47:20 +0000 (23:47 +0000)]
Merge "ART: Add missing space in log line" am: 7c73bf3518
am: eb05504443

Change-Id: I809a37228909ab7fe052b72360b91f9f2a275a1c

7 years agoMerge "ART: Add missing space in log line"
Andreas Gampe [Mon, 12 Dec 2016 23:41:21 +0000 (23:41 +0000)]
Merge "ART: Add missing space in log line"
am: 7c73bf3518

Change-Id: Ie69f9cd33fc6b1bb91db015558e1547b14b78d5f

7 years agoMerge "ART: Add missing space in log line"
Treehugger Robot [Mon, 12 Dec 2016 23:31:26 +0000 (23:31 +0000)]
Merge "ART: Add missing space in log line"

7 years agoRevert "Revert "Add kJitTableAddress for HLoadClass.""
Nicolas Geoffray [Mon, 12 Dec 2016 22:33:36 +0000 (22:33 +0000)]
Revert "Revert "Add kJitTableAddress for HLoadClass.""

This reverts commit d2d5262c8370309e1f2a009f00aafc24f1cf00a0.

Change-Id: I6149d5c7d5df0b0fc5cb646a802a2eea8d01ac08

7 years agoPrune uses library classes even without profile
Mathieu Chartier [Fri, 5 Aug 2016 23:09:09 +0000 (16:09 -0700)]
Prune uses library classes even without profile

The previous pruning relied on the classes being pruned from the
profile, and then using the profile to prune classes. If there was
no profile, the uses library classes were incorrectly left unpruned.

Leaving these classes unpruned caused aborts during compilation.

Bug: 30688277

Test: adb shell dex2oat --runtime-arg -classpath --runtime-arg /system/framework/com.google.android.maps.jar --dex-file=/data/app/comb.BBClient-1/base.apk --dex-location=/data/app/comb.BBClient-1/base.apk --oat-file=/data/app/comb.BBClient-1/oat/arm/base.odex  --app-image-file=/data/app/comb.BBClient-1/oat/arm/base.art --image-format=lz4 --compiler-filter=speed

Change-Id: I261b8894847b5b0a4f7330f49666e823a1b38bb0

7 years agoMerge changes Ieb86f678,I8e7280f0 am: 0ee6447c63
Andreas Gampe [Mon, 12 Dec 2016 21:50:59 +0000 (21:50 +0000)]
Merge changes Ieb86f678,I8e7280f0 am: 0ee6447c63
am: 83f645be5f

Change-Id: Ie29863a56154012a8721d48beb6d753c159bbe72

7 years agoART: Stack locals am: f10dfcdb76
Andreas Gampe [Mon, 12 Dec 2016 21:50:51 +0000 (21:50 +0000)]
ART: Stack locals am: f10dfcdb76
am: 19a970d771

Change-Id: I0a7bbb1e5e53e9c4608207d01c76f63c52960b13

7 years agoART: Add precise root visiting am: 585da955bc
Andreas Gampe [Mon, 12 Dec 2016 21:50:43 +0000 (21:50 +0000)]
ART: Add precise root visiting am: 585da955bc
am: 96d174d1f8

Change-Id: I4f735069322426612ddc0b449bc0c6ab21da781c

7 years agoART: Add missing space in log line
Andreas Gampe [Mon, 12 Dec 2016 21:49:00 +0000 (13:49 -0800)]
ART: Add missing space in log line

Follow-up to commit c560fc0b430816825add4125134b20eb791f6036.

Test: m
Change-Id: Ie558b2984ec629706d2122eca9dd96b8c3497298

7 years agoMerge "Disable test 964 with no-image" am: d9fb4dd3f9
Alex Light [Mon, 12 Dec 2016 21:45:28 +0000 (21:45 +0000)]
Merge "Disable test 964 with no-image" am: d9fb4dd3f9
am: 7af0c534cf

Change-Id: Ia439f4420259ac64b0ff325d3edb7be44a301fb0

7 years agoMerge changes Ieb86f678,I8e7280f0
Andreas Gampe [Mon, 12 Dec 2016 21:45:24 +0000 (21:45 +0000)]
Merge changes Ieb86f678,I8e7280f0
am: 0ee6447c63

Change-Id: If0ddecf05d828c42a50b77916c4a350389269bcb

7 years agoART: Stack locals
Andreas Gampe [Mon, 12 Dec 2016 21:45:23 +0000 (21:45 +0000)]
ART: Stack locals
am: f10dfcdb76

Change-Id: I1a3b0eb5f7a55602bc7606c2d7097f0f58271704

7 years agoART: Add precise root visiting
Andreas Gampe [Mon, 12 Dec 2016 21:45:13 +0000 (21:45 +0000)]
ART: Add precise root visiting
am: 585da955bc

Change-Id: I3dca109401326b4494de963d37c490f2185beb61

7 years agoMerge "ART: Report cputime in dex2oat" am: 3c7b8f4c45
Andreas Gampe [Mon, 12 Dec 2016 21:45:12 +0000 (21:45 +0000)]
Merge "ART: Report cputime in dex2oat" am: 3c7b8f4c45
am: 1d0095825d

Change-Id: I61ce6121f4ef804cb7b90ba12bdbc8c0c907fb8d

7 years agoMerge "Disable test 964 with no-image"
Alex Light [Mon, 12 Dec 2016 21:39:32 +0000 (21:39 +0000)]
Merge "Disable test 964 with no-image"
am: d9fb4dd3f9

Change-Id: I398437a3be31d2913de3209c65d3c73885ec4ea2

7 years agoMerge "ART: Report cputime in dex2oat"
Andreas Gampe [Mon, 12 Dec 2016 21:39:16 +0000 (21:39 +0000)]
Merge "ART: Report cputime in dex2oat"
am: 3c7b8f4c45

Change-Id: Ib1709151de04c20b452580a2e4c2a7ea36f9cb5f

7 years agoMerge changes Ieb86f678,I8e7280f0
Treehugger Robot [Mon, 12 Dec 2016 21:38:28 +0000 (21:38 +0000)]
Merge changes Ieb86f678,I8e7280f0

* changes:
  ART: Stack locals
  ART: Add precise root visiting

7 years agoMerge "Disable test 964 with no-image"
Alex Light [Mon, 12 Dec 2016 21:33:25 +0000 (21:33 +0000)]
Merge "Disable test 964 with no-image"

7 years agoMerge "ART: Report cputime in dex2oat"
Treehugger Robot [Mon, 12 Dec 2016 21:29:20 +0000 (21:29 +0000)]
Merge "ART: Report cputime in dex2oat"