OSDN Git Service

android-x86/art.git
8 years agoam 0117cfef: am 0fae2f58: Merge "Enable art host static builds only for checkbuilds."
Calin Juravle [Mon, 27 Jul 2015 11:00:31 +0000 (11:00 +0000)]
am 0117cfef: am 0fae2f58: Merge "Enable art host static builds only for checkbuilds."

* commit '0117cfef98cc01748fb14913e64b29ff223fa0ef':
  Enable art host static builds only for checkbuilds.

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 7f925348: am 939e702b: Merge "ART: Abbreviate interpreter-access-checks"
Andreas Gampe [Sun, 26 Jul 2015 17:54:23 +0000 (17:54 +0000)]
am 7f925348: am 939e702b: Merge "ART: Abbreviate interpreter-access-checks"

* commit '7f925348b6d57a4b50ccceafa978ad736ff84d04':
  ART: Abbreviate interpreter-access-checks

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 bb26acb9: am a09d5df5: Merge "Fix gcstress tests"
Mathieu Chartier [Fri, 24 Jul 2015 23:43:45 +0000 (23:43 +0000)]
am bb26acb9: am a09d5df5: Merge "Fix gcstress tests"

* commit 'bb26acb94164e4125d2fc6c17200f8b99f65a075':
  Fix gcstress tests

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 agoam 6b557d3d: am 34e1ed2f: Merge "ART: Make warnings into errors in InitZygote"
Andreas Gampe [Fri, 24 Jul 2015 23:29:47 +0000 (23:29 +0000)]
am 6b557d3d: am 34e1ed2f: Merge "ART: Make warnings into errors in InitZygote"

* commit '6b557d3d4b62a35ef70e4f881153ba66eeffeb25':
  ART: Make warnings into errors in InitZygote

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 agoam c021cc4e: am e3ab2a7d: Merge "ART: Change the stack dump format to be in line...
Andreas Gampe [Fri, 24 Jul 2015 23:04:05 +0000 (23:04 +0000)]
am c021cc4e: am e3ab2a7d: Merge "ART: Change the stack dump format to be in line with debuggerd"

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

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 agoam 0c21b5cc: am 8f3402e7: Merge "Revert "runtest: Have gcstress tests skip 955-lambda...
Igor Murashkin [Fri, 24 Jul 2015 22:36:22 +0000 (22:36 +0000)]
am 0c21b5cc: am 8f3402e7: Merge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""

* commit '0c21b5cc3af2efc2091f7bd6520b15f68b46e857':
  Revert "runtest: Have gcstress tests skip 955-lambda-smali"

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 agoam 458a7c7a: (-s ours) Merge "ART: Change the stack dump format to be in line with...
Andreas Gampe [Fri, 24 Jul 2015 21:45:37 +0000 (21:45 +0000)]
am 458a7c7a: (-s ours) Merge "ART: Change the stack dump format to be in line with debuggerd" into mnc-dev

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

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 agoMerge "ART: Change the stack dump format to be in line with debuggerd" into mnc-dev
Andreas Gampe [Fri, 24 Jul 2015 21:24:38 +0000 (21:24 +0000)]
Merge "ART: Change the stack dump format to be in line with debuggerd" into mnc-dev

8 years agoam 2f0f97c5: am 0fc01dd3: Merge "Visit class native roots from VisitReferences"
Mathieu Chartier [Fri, 24 Jul 2015 21:02:59 +0000 (21:02 +0000)]
am 2f0f97c5: am 0fc01dd3: Merge "Visit class native roots from VisitReferences"

* commit '2f0f97c549e942f7729f9b7be4f22c34cbb1146e':
  Visit class native roots from VisitReferences

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 d021e166: ART: Fix Quick/Optimizing suspend check assumption mismatch.
Vladimir Marko [Fri, 24 Jul 2015 10:11:08 +0000 (10:11 +0000)]
am d021e166: ART: Fix Quick/Optimizing suspend check assumption mismatch.

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

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
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508

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

* commit 'cd731ca7e432630b8e8645e4dff04faf0ac5d5af':
  Add some more uninterruptible annotations

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 71ab1c96: am 20cd654b: Merge "Fix alignments in quick_entrypoints_x86_64.S"
Mathieu Chartier [Thu, 23 Jul 2015 19:15:08 +0000 (19:15 +0000)]
am 71ab1c96: am 20cd654b: Merge "Fix alignments in quick_entrypoints_x86_64.S"

* commit '71ab1c960202f0572d6f43d94e64d3c2e3ea7292':
  Fix alignments in quick_entrypoints_x86_64.S

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 dd812fa1: am f7efc9ef: Merge "ART: Fix Quick/Optimizing suspend check assumption...
Vladimir Marko [Thu, 23 Jul 2015 18:57:40 +0000 (18:57 +0000)]
am dd812fa1: am f7efc9ef: Merge "ART: Fix Quick/Optimizing suspend check assumption mismatch."

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

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

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

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

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

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

* commit '8a035325a208266bd96d2b44ab06214974295e01':
  ART: Fix missing role definition

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

* commit '14e093dbbafd6eb684487ad05d67b3b76af3ea5d':
  Fix hash set memory leaks

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

* commit 'd5a482cb2610fb7ae4f17f063cb920ce81122038':
  Add uninterruptible role

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

* commit '372e3beecafaaac5e2c063eb68beca9ab3684056':
  Move to newer clang annotations

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

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

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

* commit '41c2b27b361b851ce3537b69219f17d13db0972b':
  ART: Add VerboseMethods to optimizing compiler

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

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

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

* commit '8d060f2703359c58a7253ecb59d56244ab93ba12':
  Replaced CHECK with EXPECT in tests.

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 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

(cherry picked from commit d29e8487ff1774b6eb5f0e18d854415c1ee8f6b0)

Change-Id: I733c38bf68bfc2c618f2f2e6b59f8b0e015d7be1

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 agoam 88d751b2: am c5bee2a1: Merge "Revert "Fixes and improvements in ReferenceTypePropa...
Calin Juravle [Thu, 23 Jul 2015 02:07:09 +0000 (02:07 +0000)]
am 88d751b2: am c5bee2a1: Merge "Revert "Fixes and improvements in ReferenceTypePropagation""

* commit '88d751b270c99e162dadec0c584efb0471e39da8':
  Revert "Fixes and improvements in ReferenceTypePropagation"

8 years agoam ccc2dda7: am 32d7806b: Merge "Revert "Use the object class as top in reference...
Calin Juravle [Thu, 23 Jul 2015 02:07:07 +0000 (02:07 +0000)]
am ccc2dda7: am 32d7806b: Merge "Revert "Use the object class as top in reference type propagation""

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

8 years agoam 1705b335: am d77aa00c: Merge "ART: Fix Thumb2 literal fixup."
Vladimir Marko [Thu, 23 Jul 2015 02:07:05 +0000 (02:07 +0000)]
am 1705b335: am d77aa00c: Merge "ART: Fix Thumb2 literal fixup."

* commit '1705b335cd9bf2de92442677163d61562aef2077':
  ART: Fix Thumb2 literal fixup.

8 years agoam 23d9295d: am ff6e79c9: Merge "Added unit tests to LICM."
Aart Bik [Thu, 23 Jul 2015 02:07:04 +0000 (02:07 +0000)]
am 23d9295d: am ff6e79c9: Merge "Added unit tests to LICM."

* commit '23d9295da67e6b765bc63599917c28f407237ab0':
  Added unit tests to LICM.

8 years agoam 998669b2: am 0e126bb7: Merge "When a Checker assertion cannot be parsed, display...
Roland Levillain [Thu, 23 Jul 2015 02:07:02 +0000 (02:07 +0000)]
am 998669b2: am 0e126bb7: Merge "When a Checker assertion cannot be parsed, display it."

* commit '998669b277762c29adb9148d743a2e892e1c321f':
  When a Checker assertion cannot be parsed, display it.

8 years agoam 3683469c: am 60f4804f: Merge "Delete extraneous prefix `SideEffects::` in `nodes...
Roland Levillain [Thu, 23 Jul 2015 02:07:00 +0000 (02:07 +0000)]
am 3683469c: am 60f4804f: Merge "Delete extraneous prefix `SideEffects::` in `nodes.h`."

* commit '3683469c94eed63a589b0801dbd2b10faff25d72':
  Delete extraneous prefix `SideEffects::` in `nodes.h`.

8 years agoam 300a6384: am e6e38ce0: Merge "Use the object class as top in reference type propag...
Calin Juravle [Thu, 23 Jul 2015 02:06:59 +0000 (02:06 +0000)]
am 300a6384: am e6e38ce0: Merge "Use the object class as top in reference type propagation"

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

8 years agoam 0a3fb002: am a3073e24: Merge "Fixes and improvements in ReferenceTypePropagation"
Calin Juravle [Thu, 23 Jul 2015 02:06:57 +0000 (02:06 +0000)]
am 0a3fb002: am a3073e24: Merge "Fixes and improvements in ReferenceTypePropagation"

* commit '0a3fb00222bdb0010e851c7b1e834f8502e52df2':
  Fixes and improvements in ReferenceTypePropagation

8 years agoam 8e9d3f06: am 236d0a3c: Merge changes from topic \'lambda_experimental\'
Igor Murashkin [Thu, 23 Jul 2015 02:06:54 +0000 (02:06 +0000)]
am 8e9d3f06: am 236d0a3c: Merge changes from topic \'lambda_experimental\'

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

8 years agoam d72bef09: am c962dd74: Merge "Prefer 32-bit host executables on Mac."
Ying Wang [Thu, 23 Jul 2015 02:06:40 +0000 (02:06 +0000)]
am d72bef09: am c962dd74: Merge "Prefer 32-bit host executables on Mac."

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

8 years agoam 0a72d65a: am 56ebee4d: Merge "Add more checks to diagnose flaky oat file assistant...
Richard Uhler [Thu, 23 Jul 2015 02:06:16 +0000 (02:06 +0000)]
am 0a72d65a: am 56ebee4d: Merge "Add more checks to diagnose flaky oat file assistant test."

* commit '0a72d65ab483085c6de22bf76176873cddd5a30f':
  Add more checks to diagnose flaky oat file assistant test.

8 years agoam 9aa5c9be: am 2bb897ea: Merge "Refine the canary pattern in RedZone"
Andreas Gampe [Thu, 23 Jul 2015 01:27:38 +0000 (01:27 +0000)]
am 9aa5c9be: am 2bb897ea: Merge "Refine the canary pattern in RedZone"

* commit '9aa5c9bedecc2def743a428ca0f03384ac42a1fd':
  Refine the canary pattern in RedZone

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