OSDN Git Service

android-x86/art.git
8 years agoam 87bada67: Merge "Cosmetic changes in ART run-tests."
Roland Levillain [Mon, 27 Jul 2015 15:42:47 +0000 (15:42 +0000)]
am 87bada67: Merge "Cosmetic changes in ART run-tests."

* commit '87bada67022b877273e7aaf09546af7aa35238ff':
  Cosmetic changes in ART run-tests.

8 years agoam ee1e8987: Merge "Fix & add Checker assertions in 442-checker-constant-folding."
Roland Levillain [Mon, 27 Jul 2015 15:42:45 +0000 (15:42 +0000)]
am ee1e8987: Merge "Fix & add Checker assertions in 442-checker-constant-folding."

* commit 'ee1e8987a862b9c1ae1533c04162e42dbf23b964':
  Fix & add Checker assertions in 442-checker-constant-folding.

8 years agoMerge "Cosmetic changes in ART run-tests."
Roland Levillain [Mon, 27 Jul 2015 15:29:58 +0000 (15:29 +0000)]
Merge "Cosmetic changes in ART run-tests."

8 years agoMerge "Fix & add Checker assertions in 442-checker-constant-folding."
Roland Levillain [Mon, 27 Jul 2015 15:28:20 +0000 (15:28 +0000)]
Merge "Fix & add Checker assertions in 442-checker-constant-folding."

8 years agoCosmetic changes in ART run-tests.
Roland Levillain [Thu, 23 Jul 2015 11:15:01 +0000 (12:15 +0100)]
Cosmetic changes in ART run-tests.

Perform a copyright headers clean up mostly.

Change-Id: I26c855b2f54d0887676d9b9b8281b14b7978ab29

8 years agoFix & add Checker assertions in 442-checker-constant-folding.
Roland Levillain [Thu, 23 Jul 2015 11:11:42 +0000 (12:11 +0100)]
Fix & add Checker assertions in 442-checker-constant-folding.

Change-Id: Id4165b14816c04961d5c274f24861d0e7856d95e

8 years agoam 0fae2f58: Merge "Enable art host static builds only for checkbuilds."
Calin Juravle [Mon, 27 Jul 2015 10:49:11 +0000 (10:49 +0000)]
am 0fae2f58: Merge "Enable art host static builds only for checkbuilds."

* commit '0fae2f5851dd79c4100134a92f997b2e7a520083':
  Enable art host static builds only for checkbuilds.

8 years agoMerge "Enable art host static builds only for checkbuilds."
Calin Juravle [Mon, 27 Jul 2015 10:39:13 +0000 (10:39 +0000)]
Merge "Enable art host static builds only for checkbuilds."

8 years agoam 939e702b: Merge "ART: Abbreviate interpreter-access-checks"
Andreas Gampe [Sun, 26 Jul 2015 17:43:01 +0000 (17:43 +0000)]
am 939e702b: Merge "ART: Abbreviate interpreter-access-checks"

* commit '939e702be62b059250f0e810f6bdd299186a08a0':
  ART: Abbreviate interpreter-access-checks

8 years agoMerge "ART: Abbreviate interpreter-access-checks"
Andreas Gampe [Sun, 26 Jul 2015 17:31:59 +0000 (17:31 +0000)]
Merge "ART: Abbreviate interpreter-access-checks"

8 years agoART: Abbreviate interpreter-access-checks
Andreas Gampe [Sun, 26 Jul 2015 17:26:03 +0000 (10:26 -0700)]
ART: Abbreviate interpreter-access-checks

Tag is too long.

Change-Id: I49febb97cec1172bcf06438fe8e0605f266e3fde

8 years agoam a09d5df5: Merge "Fix gcstress tests"
Mathieu Chartier [Fri, 24 Jul 2015 23:30:50 +0000 (23:30 +0000)]
am a09d5df5: Merge "Fix gcstress tests"

* commit 'a09d5df5128c5c51226028d4a82ed461cf993024':
  Fix gcstress tests

8 years agoMerge "Fix gcstress tests"
Mathieu Chartier [Fri, 24 Jul 2015 23:17:16 +0000 (23:17 +0000)]
Merge "Fix gcstress tests"

8 years agoFix gcstress tests
Mathieu Chartier [Fri, 24 Jul 2015 23:05:55 +0000 (16:05 -0700)]
Fix gcstress tests

We may visit the native roots multiple times (e.g. temp classes).
This used to not be handled by the SS GC but is now handle by
MarkObjectIfNotInToSpace.

Change-Id: I18226e20b36ace41c155ba4c3f54eac2244f524c

8 years agoam 34e1ed2f: Merge "ART: Make warnings into errors in InitZygote"
Andreas Gampe [Fri, 24 Jul 2015 23:08:58 +0000 (23:08 +0000)]
am 34e1ed2f: Merge "ART: Make warnings into errors in InitZygote"

* commit '34e1ed2ff52b4a3a1115b6ad467d6978d2b489a3':
  ART: Make warnings into errors in InitZygote

8 years agoMerge "ART: Make warnings into errors in InitZygote"
Andreas Gampe [Fri, 24 Jul 2015 22:56:43 +0000 (22:56 +0000)]
Merge "ART: Make warnings into errors in InitZygote"

8 years agoART: Make warnings into errors in InitZygote
Andreas Gampe [Fri, 24 Jul 2015 22:41:20 +0000 (15:41 -0700)]
ART: Make warnings into errors in InitZygote

These warnings are actual errors and lead to failure to start the
runtime. Print them accordingly.

Change-Id: I907e32a3c5da5364ecc9678bb9a11604234d669c

8 years agoam e3ab2a7d: Merge "ART: Change the stack dump format to be in line with debuggerd"
Andreas Gampe [Fri, 24 Jul 2015 22:40:50 +0000 (22:40 +0000)]
am e3ab2a7d: Merge "ART: Change the stack dump format to be in line with debuggerd"

* commit 'e3ab2a7dc3ff7ef0da6a82de7387470fb67695d0':
  ART: Change the stack dump format to be in line with debuggerd

8 years agoMerge "ART: Change the stack dump format to be in line with debuggerd"
Andreas Gampe [Fri, 24 Jul 2015 22:25:01 +0000 (22:25 +0000)]
Merge "ART: Change the stack dump format to be in line with debuggerd"

8 years agoam 8f3402e7: Merge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""
Igor Murashkin [Fri, 24 Jul 2015 22:17:53 +0000 (22:17 +0000)]
am 8f3402e7: Merge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""

* commit '8f3402e70bfdd1f768ccfe7614184f71fd8e7d19':
  Revert "runtest: Have gcstress tests skip 955-lambda-smali"

8 years agoART: Change the stack dump format to be in line with debuggerd
Andreas Gampe [Thu, 23 Jul 2015 21:37:18 +0000 (14:37 -0700)]
ART: Change the stack dump format to be in line with debuggerd

Make offsets 16 digits on 64-bit platforms.

Add the ability to provide the build fingerprint, and print it in
the traces output.

Bug: 22693991

(cherry picked from commit 242ae94dc39be53e519a6163ea1db494ceb75954)

Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508

8 years agoMerge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""
Igor Murashkin [Fri, 24 Jul 2015 22:01:21 +0000 (22:01 +0000)]
Merge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""

8 years agoRevert "runtest: Have gcstress tests skip 955-lambda-smali"
Igor Murashkin [Fri, 24 Jul 2015 21:43:26 +0000 (14:43 -0700)]
Revert "runtest: Have gcstress tests skip 955-lambda-smali"

This reverts commit ef3119e6c75c431d9cf54e92dfe5b805597b1657.

8 years agoam 0fc01dd3: Merge "Visit class native roots from VisitReferences"
Mathieu Chartier [Fri, 24 Jul 2015 19:09:23 +0000 (19:09 +0000)]
am 0fc01dd3: Merge "Visit class native roots from VisitReferences"

* commit '0fc01dd3725792a190f4c97cbdfefd2733b76e21':
  Visit class native roots from VisitReferences

8 years agoMerge "Visit class native roots from VisitReferences"
Mathieu Chartier [Fri, 24 Jul 2015 18:58:57 +0000 (18:58 +0000)]
Merge "Visit class native roots from VisitReferences"

8 years agoVisit class native roots from VisitReferences
Mathieu Chartier [Thu, 23 Jul 2015 23:01:26 +0000 (16:01 -0700)]
Visit class native roots from VisitReferences

Visit class roots when we call Class::VisitReferences instead of in
the class linker. This makes it easier to implement class unloading
since unmarked classes won't have their roots visited by the class
linker.

Bug: 22181835
Change-Id: I63f31e5ebef7b2a0b764b3ba3cb038b3f561b379

8 years agoEnable art host static builds only for checkbuilds.
Calin Juravle [Fri, 24 Jul 2015 15:45:26 +0000 (16:45 +0100)]
Enable art host static builds only for checkbuilds.

Change-Id: I42cc850089a5ecbcc201699f0b996da4fd959bb3

8 years agoam 2a7ea34c: Merge "Add some more uninterruptible annotations"
Mathieu Chartier [Thu, 23 Jul 2015 22:04:51 +0000 (22:04 +0000)]
am 2a7ea34c: Merge "Add some more uninterruptible annotations"

* commit '2a7ea34cda9bf776339dfc7f4a22ab01f9525f2d':
  Add some more uninterruptible annotations

8 years agoMerge "Add some more uninterruptible annotations"
Mathieu Chartier [Thu, 23 Jul 2015 21:56:01 +0000 (21:56 +0000)]
Merge "Add some more uninterruptible annotations"

8 years agoAdd some more uninterruptible annotations
Mathieu Chartier [Thu, 23 Jul 2015 21:11:16 +0000 (14:11 -0700)]
Add some more uninterruptible annotations

Added to mirror sites, class linker, and intern table.

Bug: 20072211
Change-Id: I2224bcefefaab05d325f14844b1514e3d719e649

8 years agoam 20cd654b: Merge "Fix alignments in quick_entrypoints_x86_64.S"
Mathieu Chartier [Thu, 23 Jul 2015 19:08:17 +0000 (19:08 +0000)]
am 20cd654b: Merge "Fix alignments in quick_entrypoints_x86_64.S"

* commit '20cd654b84404af22aa0ac12b3952a317393b2d5':
  Fix alignments in quick_entrypoints_x86_64.S

8 years agoMerge "Fix alignments in quick_entrypoints_x86_64.S"
Mathieu Chartier [Thu, 23 Jul 2015 18:59:17 +0000 (18:59 +0000)]
Merge "Fix alignments in quick_entrypoints_x86_64.S"

8 years agoam f7efc9ef: Merge "ART: Fix Quick/Optimizing suspend check assumption mismatch."
Vladimir Marko [Thu, 23 Jul 2015 18:37:19 +0000 (18:37 +0000)]
am f7efc9ef: Merge "ART: Fix Quick/Optimizing suspend check assumption mismatch."

* commit 'f7efc9ef90c38212f8c4fbece99080f784a53181':
  ART: Fix Quick/Optimizing suspend check assumption mismatch.

8 years agoam bea4eb4b: Merge "Disable Checker for tests that don\'t invoke the compiler."
David Brazdil [Thu, 23 Jul 2015 18:37:17 +0000 (18:37 +0000)]
am bea4eb4b: Merge "Disable Checker for tests that don\'t invoke the compiler."

* commit 'bea4eb4b29aa1030aa1919dfedaa95aea2599b7a':
  Disable Checker for tests that don't invoke the compiler.

8 years agoam bd76db36: Merge "Fix and extend the documentation of art::Thread\'s fields offsets."
Roland Levillain [Thu, 23 Jul 2015 18:37:16 +0000 (18:37 +0000)]
am bd76db36: Merge "Fix and extend the documentation of art::Thread\'s fields offsets."

* commit 'bd76db36abc1026cdc3f737ec0f2be6174a131a1':
  Fix and extend the documentation of art::Thread's fields offsets.

8 years agoam 195fa34d: Merge "ART: Fix missing role definition"
Andreas Gampe [Thu, 23 Jul 2015 18:37:14 +0000 (18:37 +0000)]
am 195fa34d: Merge "ART: Fix missing role definition"

* commit '195fa34db058b12c0f53f49ded482fd28d73d7d2':
  ART: Fix missing role definition

8 years agoam d59f0b19: Merge "Fix hash set memory leaks"
Mathieu Chartier [Thu, 23 Jul 2015 18:37:12 +0000 (18:37 +0000)]
am d59f0b19: Merge "Fix hash set memory leaks"

* commit 'd59f0b198ae5a0bf2cc4d2f9cadbe51ebf14277e':
  Fix hash set memory leaks

8 years agoam 3c9c7760: Merge "Add uninterruptible role"
Mathieu Chartier [Thu, 23 Jul 2015 18:37:11 +0000 (18:37 +0000)]
am 3c9c7760: Merge "Add uninterruptible role"

* commit '3c9c776017cd628d594fda0943634f2bdcc980b8':
  Add uninterruptible role

8 years agoam f64914d7: Merge "Move to newer clang annotations"
Mathieu Chartier [Thu, 23 Jul 2015 18:37:09 +0000 (18:37 +0000)]
am f64914d7: Merge "Move to newer clang annotations"

* commit 'f64914d7392b7d35c7f35bc917b0797b9c4605ac':
  Move to newer clang annotations

8 years agoam fab0712a: Merge "runtest: Have gcstress tests skip 955-lambda-smali"
Igor Murashkin [Thu, 23 Jul 2015 18:37:07 +0000 (18:37 +0000)]
am fab0712a: Merge "runtest: Have gcstress tests skip 955-lambda-smali"

* commit 'fab0712a178670949c909f55486648c425add463':
  runtest: Have gcstress tests skip 955-lambda-smali

8 years agoam 6078aec2: Merge "ART: Add VerboseMethods to optimizing compiler"
Andreas Gampe [Thu, 23 Jul 2015 18:37:05 +0000 (18:37 +0000)]
am 6078aec2: Merge "ART: Add VerboseMethods to optimizing compiler"

* commit '6078aec213dfaf111c29969706e8e5967cfc9bea':
  ART: Add VerboseMethods to optimizing compiler

8 years agoam d8da9dc8: Merge "More diagnostics for flaky oat file assistant test."
Richard Uhler [Thu, 23 Jul 2015 18:37:03 +0000 (18:37 +0000)]
am d8da9dc8: Merge "More diagnostics for flaky oat file assistant test."

* commit 'd8da9dc897ececb8df8cafd458b48fa65a703acc':
  More diagnostics for flaky oat file assistant test.

8 years agoam c20d7286: Merge "Replaced CHECK with EXPECT in tests."
Aart Bik [Thu, 23 Jul 2015 18:37:01 +0000 (18:37 +0000)]
am c20d7286: Merge "Replaced CHECK with EXPECT in tests."

* commit 'c20d728627c19f7d81328bed9b800a643f6ba680':
  Replaced CHECK with EXPECT in tests.

8 years agoFix alignments in quick_entrypoints_x86_64.S
Man Cao [Thu, 23 Jul 2015 18:18:49 +0000 (11:18 -0700)]
Fix alignments in quick_entrypoints_x86_64.S

Places calling artIsAssignableFromCode() were not 16-byte aligned.

Change-Id: I86ff4f73a942ede09c0206e76614eb826dd896c2

8 years agoMerge "ART: Fix Quick/Optimizing suspend check assumption mismatch."
Vladimir Marko [Thu, 23 Jul 2015 16:53:02 +0000 (16:53 +0000)]
Merge "ART: Fix Quick/Optimizing suspend check assumption mismatch."

8 years agoMerge "Disable Checker for tests that don't invoke the compiler."
David Brazdil [Thu, 23 Jul 2015 16:18:59 +0000 (16:18 +0000)]
Merge "Disable Checker for tests that don't invoke the compiler."

8 years agoART: Fix Quick/Optimizing suspend check assumption mismatch.
Vladimir Marko [Wed, 22 Jul 2015 16:50:37 +0000 (17:50 +0100)]
ART: Fix Quick/Optimizing suspend check assumption mismatch.

Quick's SuspendCheckElimination (SCE) expects that every
method contains a suspend check and it eliminates suspend
checks in loops containing an invoke. Optimizing eliminates
the suspend check from leaf methods, so the combination of
a Quick-compiled loop calling an Optimizing-compiled leaf
method can lead to missing suspend checks and potentially
leading to ANRs.

Enable Quick's kLeafOptimization flag to remove suspend
checks from leaf methods and disable Quick's SCE. This
aligns the suspend check placement for the two backends
and avoids the broken combination.

Currently, all methods containing a try-catch are compiled
with Quick, so it's relatively easy to create a regression
test. However, this test will not be valid when Optimizing
starts supporting try-catch.

Bug: 22657404
Change-Id: I3bc40bf3f5c1e7d18704d1547b139e939950b770

8 years agoDisable Checker for tests that don't invoke the compiler.
David Brazdil [Thu, 23 Jul 2015 10:53:42 +0000 (11:53 +0100)]
Disable Checker for tests that don't invoke the compiler.

Running tests in no-prebuild mode will resort to running the
interpreter when either dex2oat or patchoat are not available, thus
not producing the CFG dump tested by Checker. This patch disables
Checker under such configurations.

Bug: 22552692

Change-Id: I23c97aa0aa627675861ef84f8c570303b614d9af

8 years agoMerge "Fix and extend the documentation of art::Thread's fields offsets."
Roland Levillain [Thu, 23 Jul 2015 10:26:14 +0000 (10:26 +0000)]
Merge "Fix and extend the documentation of art::Thread's fields offsets."

8 years agoMerge "ART: Fix missing role definition"
Andreas Gampe [Thu, 23 Jul 2015 08:14:14 +0000 (08:14 +0000)]
Merge "ART: Fix missing role definition"

8 years agoART: Fix missing role definition
Andreas Gampe [Thu, 23 Jul 2015 06:44:55 +0000 (23:44 -0700)]
ART: Fix missing role definition

Add missing static member definition. Follow-up to
4e2cb098017bf073335ebb02b1bc0a36828cd720

Bug: 20072211
Change-Id: I392da3724ded7c455b9b57add6fceb70191f9ff6

8 years agoMerge "Fix hash set memory leaks"
Mathieu Chartier [Thu, 23 Jul 2015 03:14:15 +0000 (03:14 +0000)]
Merge "Fix hash set memory leaks"

8 years agoFix hash set memory leaks
Mathieu Chartier [Thu, 23 Jul 2015 02:39:56 +0000 (19:39 -0700)]
Fix hash set memory leaks

There was a memory leak if ShrinkToMaximumLoad caused the set to
become 0 size. Fixes valgrind tests.

Change-Id: Ibdd033768d622443fb34e7a5e5e1c00e082a1a4a

8 years agoMerge "Add uninterruptible role"
Mathieu Chartier [Thu, 23 Jul 2015 00:49:51 +0000 (00:49 +0000)]
Merge "Add uninterruptible role"

8 years agoAdd uninterruptible role
Mathieu Chartier [Wed, 22 Jul 2015 23:17:51 +0000 (16:17 -0700)]
Add uninterruptible role

Example error:
cannot call function 'CopyOf' while mutex 'uninterruptible_' is held

TODO: Add annotation to more locations.

Bug: 20072211

Change-Id: I1bbf5a77e3deeafa5898df529cb7cb53a6d010d2

8 years agoMerge "Move to newer clang annotations"
Mathieu Chartier [Wed, 22 Jul 2015 22:19:19 +0000 (22:19 +0000)]
Merge "Move to newer clang annotations"

8 years agoMerge "runtest: Have gcstress tests skip 955-lambda-smali"
Igor Murashkin [Wed, 22 Jul 2015 22:18:42 +0000 (22:18 +0000)]
Merge "runtest: Have gcstress tests skip 955-lambda-smali"

8 years agoruntest: Have gcstress tests skip 955-lambda-smali
Igor Murashkin [Wed, 22 Jul 2015 22:15:06 +0000 (15:15 -0700)]
runtest: Have gcstress tests skip 955-lambda-smali

This prevents the test from failing due to a timeout (temporarily).

Bug: 22665783
Change-Id: I978786ba2f94de8f13e32718a16e6909820dab51

8 years agoMove to newer clang annotations
Mathieu Chartier [Fri, 17 Jul 2015 03:32:27 +0000 (20:32 -0700)]
Move to newer clang annotations

Also enable -Wthread-safety-negative.

Changes:
Switch to capabilities and negative capabilities.

Future work:
Use capabilities to implement uninterruptible annotations to work
with AssertNoThreadSuspension.

Bug: 20072211

Change-Id: I42fcbe0300d98a831c89d1eff3ecd5a7e99ebf33

8 years agoMerge "ART: Add VerboseMethods to optimizing compiler"
Andreas Gampe [Wed, 22 Jul 2015 21:45:44 +0000 (21:45 +0000)]
Merge "ART: Add VerboseMethods to optimizing compiler"

8 years agoART: Add VerboseMethods to optimizing compiler
Andreas Gampe [Wed, 22 Jul 2015 19:10:13 +0000 (12:10 -0700)]
ART: Add VerboseMethods to optimizing compiler

Bring the optimizing compiler up to Quick levels for debuggability.

Change-Id: Ib2adce7a31cc6a60c37c63d0df5cb6a35a85e790

9 years agoMerge "More diagnostics for flaky oat file assistant test."
Richard Uhler [Wed, 22 Jul 2015 19:24:28 +0000 (19:24 +0000)]
Merge "More diagnostics for flaky oat file assistant test."

9 years agoMerge "Replaced CHECK with EXPECT in tests."
Aart Bik [Wed, 22 Jul 2015 18:33:17 +0000 (18:33 +0000)]
Merge "Replaced CHECK with EXPECT in tests."

9 years agoReplaced CHECK with EXPECT in tests.
Aart Bik [Wed, 22 Jul 2015 18:27:39 +0000 (11:27 -0700)]
Replaced CHECK with EXPECT in tests.

Doh!

Change-Id: Ibef45031146215034647c7eaab4065c766d6fb86

9 years agoam c5bee2a1: Merge "Revert "Fixes and improvements in ReferenceTypePropagation""
Calin Juravle [Wed, 22 Jul 2015 17:30:47 +0000 (17:30 +0000)]
am c5bee2a1: Merge "Revert "Fixes and improvements in ReferenceTypePropagation""

* commit 'c5bee2a133f6505b8004075288b19efb99e24b4f':
  Revert "Fixes and improvements in ReferenceTypePropagation"

9 years agoam 32d7806b: Merge "Revert "Use the object class as top in reference type propagation""
Calin Juravle [Wed, 22 Jul 2015 17:30:45 +0000 (17:30 +0000)]
am 32d7806b: Merge "Revert "Use the object class as top in reference type propagation""

* commit '32d7806b34efda2af0f5a0eaaa384c781565d364':
  Revert "Use the object class as top in reference type propagation"

9 years agoMerge "Revert "Fixes and improvements in ReferenceTypePropagation""
Calin Juravle [Wed, 22 Jul 2015 17:20:08 +0000 (17:20 +0000)]
Merge "Revert "Fixes and improvements in ReferenceTypePropagation""

9 years agoMerge "Revert "Use the object class as top in reference type propagation""
Calin Juravle [Wed, 22 Jul 2015 17:19:20 +0000 (17:19 +0000)]
Merge "Revert "Use the object class as top in reference type propagation""

9 years agoRevert "Use the object class as top in reference type propagation"
Calin Juravle [Wed, 22 Jul 2015 17:14:50 +0000 (17:14 +0000)]
Revert "Use the object class as top in reference type propagation"

This reverts commit 3fabec7a25d151b26ba7de13615bbead0dd615a6.

Change-Id: Id8614f6b6e3e0e4c9caeb9f771e4c145d9fec64f

9 years agoRevert "Fixes and improvements in ReferenceTypePropagation"
Calin Juravle [Wed, 22 Jul 2015 17:14:32 +0000 (17:14 +0000)]
Revert "Fixes and improvements in ReferenceTypePropagation"

This reverts commit b0d5fc0ac139da4aaa1440263416b9bde05630b0.

Change-Id: Iea8adfc0bd4cb7ee2b292278b8bac80a259acbd1

9 years agoam d77aa00c: Merge "ART: Fix Thumb2 literal fixup."
Vladimir Marko [Wed, 22 Jul 2015 16:44:26 +0000 (16:44 +0000)]
am d77aa00c: Merge "ART: Fix Thumb2 literal fixup."

* commit 'd77aa00c583cc72f96bc4522d02d2070dcd72f1c':
  ART: Fix Thumb2 literal fixup.

9 years agoMerge "ART: Fix Thumb2 literal fixup."
Vladimir Marko [Wed, 22 Jul 2015 16:32:16 +0000 (16:32 +0000)]
Merge "ART: Fix Thumb2 literal fixup."

9 years agoam ff6e79c9: Merge "Added unit tests to LICM."
Aart Bik [Wed, 22 Jul 2015 16:23:50 +0000 (16:23 +0000)]
am ff6e79c9: Merge "Added unit tests to LICM."

* commit 'ff6e79c97f25692fdaae503e59f4f9e19bbdb4c0':
  Added unit tests to LICM.

9 years agoFix and extend the documentation of art::Thread's fields offsets.
Roland Levillain [Wed, 22 Jul 2015 16:19:28 +0000 (17:19 +0100)]
Fix and extend the documentation of art::Thread's fields offsets.

Change-Id: Ie13c71d1b734ec0778c388b9bcb7773dcf319f16

9 years agoMerge "Added unit tests to LICM."
Aart Bik [Wed, 22 Jul 2015 16:13:43 +0000 (16:13 +0000)]
Merge "Added unit tests to LICM."

9 years agoam 0e126bb7: Merge "When a Checker assertion cannot be parsed, display it."
Roland Levillain [Wed, 22 Jul 2015 15:30:47 +0000 (15:30 +0000)]
am 0e126bb7: Merge "When a Checker assertion cannot be parsed, display it."

* commit '0e126bb7c6c001c63f104797912a38cbe619073c':
  When a Checker assertion cannot be parsed, display it.

9 years agoMore diagnostics for flaky oat file assistant test.
Richard Uhler [Wed, 22 Jul 2015 15:25:11 +0000 (08:25 -0700)]
More diagnostics for flaky oat file assistant test.

When we generate an odex file for test, verify it is generated properly, and
if it is not supposed to be generated pic, verify it needs relocation right
after generating the odex file.

Bug: 22599792
Change-Id: I75fbbaafc7a425e20fe3495657e1c38ae7b15d56

9 years agoMerge "When a Checker assertion cannot be parsed, display it."
Roland Levillain [Wed, 22 Jul 2015 15:18:42 +0000 (15:18 +0000)]
Merge "When a Checker assertion cannot be parsed, display it."

9 years agoam 60f4804f: Merge "Delete extraneous prefix `SideEffects::` in `nodes.h`."
Roland Levillain [Wed, 22 Jul 2015 14:51:40 +0000 (14:51 +0000)]
am 60f4804f: Merge "Delete extraneous prefix `SideEffects::` in `nodes.h`."

* commit '60f4804fc2dd9abb008a08fc2209a943bedef135':
  Delete extraneous prefix `SideEffects::` in `nodes.h`.

9 years agoMerge "Delete extraneous prefix `SideEffects::` in `nodes.h`."
Roland Levillain [Wed, 22 Jul 2015 14:42:54 +0000 (14:42 +0000)]
Merge "Delete extraneous prefix `SideEffects::` in `nodes.h`."

9 years agoWhen a Checker assertion cannot be parsed, display it.
Roland Levillain [Wed, 22 Jul 2015 12:37:27 +0000 (13:37 +0100)]
When a Checker assertion cannot be parsed, display it.

Change-Id: Ib667c7aa24b2753f0963ed6b1f9f4227a9e586f4

9 years agoDelete extraneous prefix `SideEffects::` in `nodes.h`.
Alexandre Rames [Wed, 22 Jul 2015 10:32:58 +0000 (11:32 +0100)]
Delete extraneous prefix `SideEffects::` in `nodes.h`.

Change-Id: Ic0a8442d20323df0d9db9e6a1d26c07bd903a13d

9 years agoART: Fix Thumb2 literal fixup.
Vladimir Marko [Wed, 22 Jul 2015 10:28:14 +0000 (11:28 +0100)]
ART: Fix Thumb2 literal fixup.

When processing a load literal during fixup, we use the
current code size to determine whether we need to add the
padding before literals. However, this may change by the end
of the fixup, yet we didn't recalculate to see if the load
literal is pushed out of range.

Instead of making the load literal fixup also depend on all
preceding fixups, add an extra pass over literals when we
need the padding and repeat the fixup loop if needed.

Change-Id: Ia21d660486167a2dcb1ad4afe8acc669b4af669d

9 years agoam e6e38ce0: Merge "Use the object class as top in reference type propagation"
Calin Juravle [Wed, 22 Jul 2015 11:33:57 +0000 (11:33 +0000)]
am e6e38ce0: Merge "Use the object class as top in reference type propagation"

* commit 'e6e38ce021ef5e0d326d76172307c000e0e6fab3':
  Use the object class as top in reference type propagation

9 years agoam a3073e24: Merge "Fixes and improvements in ReferenceTypePropagation"
Calin Juravle [Wed, 22 Jul 2015 11:33:55 +0000 (11:33 +0000)]
am a3073e24: Merge "Fixes and improvements in ReferenceTypePropagation"

* commit 'a3073e24e00274d2957771518be5ecfa74591744':
  Fixes and improvements in ReferenceTypePropagation

9 years agoMerge "Use the object class as top in reference type propagation"
Calin Juravle [Wed, 22 Jul 2015 11:20:14 +0000 (11:20 +0000)]
Merge "Use the object class as top in reference type propagation"

9 years agoMerge "Fixes and improvements in ReferenceTypePropagation"
Calin Juravle [Wed, 22 Jul 2015 11:20:01 +0000 (11:20 +0000)]
Merge "Fixes and improvements in ReferenceTypePropagation"

9 years agoAdded unit tests to LICM.
Aart Bik [Wed, 22 Jul 2015 01:30:18 +0000 (18:30 -0700)]
Added unit tests to LICM.

Rationale:
LICM did not have its own unit test yet, and it was a good
time to ensure that the improved side effect analysis does
what it is supposed to. Also, a nice way for me to get
familiar with the testing infrastructure.

Change-Id: I16471e5fd99615c04a59b09c4a69126d7a94684f

9 years agoam 236d0a3c: Merge changes from topic \'lambda_experimental\'
Igor Murashkin [Wed, 22 Jul 2015 01:12:38 +0000 (01:12 +0000)]
am 236d0a3c: Merge changes from topic \'lambda_experimental\'

* commit '236d0a3c35a369da99bb1f0c617a29f23b2f4df8':
  interpreter: Add tests for move-result after invoke-lambda
  verifier: Skip verification of methods when seeing experimental opcodes

9 years agoMerge changes from topic 'lambda_experimental'
Igor Murashkin [Wed, 22 Jul 2015 01:00:59 +0000 (01:00 +0000)]
Merge changes from topic 'lambda_experimental'

* changes:
  interpreter: Add tests for move-result after invoke-lambda
  verifier: Skip verification of methods when seeing experimental opcodes

9 years agointerpreter: Add tests for move-result after invoke-lambda
Igor Murashkin [Wed, 22 Jul 2015 00:04:35 +0000 (17:04 -0700)]
interpreter: Add tests for move-result after invoke-lambda

Bug: 22638098
Change-Id: I9c428055eef0bc95f4f7aacd03be56547df812d9

9 years agoverifier: Skip verification of methods when seeing experimental opcodes
Igor Murashkin [Wed, 22 Jul 2015 00:03:36 +0000 (17:03 -0700)]
verifier: Skip verification of methods when seeing experimental opcodes

Bug: 22638098
Change-Id: I9f172f3e0e7ad2aa8873e4036415702fee6bf2eb

9 years agoam c962dd74: Merge "Prefer 32-bit host executables on Mac."
Ying Wang [Tue, 21 Jul 2015 23:57:44 +0000 (23:57 +0000)]
am c962dd74: Merge "Prefer 32-bit host executables on Mac."

* commit 'c962dd742ea2c514cd36f02381c0ad33fc89e8b3':
  Prefer 32-bit host executables on Mac.

9 years agoMerge "Prefer 32-bit host executables on Mac."
Ying Wang [Tue, 21 Jul 2015 23:45:21 +0000 (23:45 +0000)]
Merge "Prefer 32-bit host executables on Mac."

9 years agoam 56ebee4d: Merge "Add more checks to diagnose flaky oat file assistant test."
Richard Uhler [Tue, 21 Jul 2015 20:38:49 +0000 (20:38 +0000)]
am 56ebee4d: Merge "Add more checks to diagnose flaky oat file assistant test."

* commit '56ebee4d2b94bcf4040f49eddaa35ad7e43cc53d':
  Add more checks to diagnose flaky oat file assistant test.

9 years agoMerge "Add more checks to diagnose flaky oat file assistant test."
Richard Uhler [Tue, 21 Jul 2015 20:27:18 +0000 (20:27 +0000)]
Merge "Add more checks to diagnose flaky oat file assistant test."

9 years agoPrefer 32-bit host executables on Mac.
Ying Wang [Tue, 21 Jul 2015 19:05:30 +0000 (12:05 -0700)]
Prefer 32-bit host executables on Mac.

Bug: 22527295
Change-Id: I2cb1d3086b65b8227e6bdac9c0485fdc452f1e9c

9 years agoam 2bb897ea: Merge "Refine the canary pattern in RedZone"
Andreas Gampe [Tue, 21 Jul 2015 18:07:43 +0000 (18:07 +0000)]
am 2bb897ea: Merge "Refine the canary pattern in RedZone"

* commit '2bb897ea8551ff8f486a59c7bc8368f4388b7760':
  Refine the canary pattern in RedZone

9 years agoMerge "Refine the canary pattern in RedZone"
Andreas Gampe [Tue, 21 Jul 2015 17:56:40 +0000 (17:56 +0000)]
Merge "Refine the canary pattern in RedZone"

9 years agoam b203b332: Merge "ART: Fix UninitializedReference handling"
Andreas Gampe [Tue, 21 Jul 2015 16:43:38 +0000 (16:43 +0000)]
am b203b332: Merge "ART: Fix UninitializedReference handling"

* commit 'b203b332be18c7bf1e4b3be3e0ddd345174e0517':
  ART: Fix UninitializedReference handling