OSDN Git Service

android-x86/art.git
10 years agoam d596a671: am ff9d95d5: Merge "Tweaks to patchoat and other related things."
Andreas Gampe [Sat, 26 Jul 2014 13:19:55 +0000 (13:19 +0000)]
am d596a671: am ff9d95d5: Merge "Tweaks to patchoat and other related things."

* commit 'd596a671f5de02174369b96af6739158cb67428f':
  Tweaks to patchoat and other related things.

10 years agoam ff9d95d5: Merge "Tweaks to patchoat and other related things."
Andreas Gampe [Sat, 26 Jul 2014 13:14:45 +0000 (13:14 +0000)]
am ff9d95d5: Merge "Tweaks to patchoat and other related things."

* commit 'ff9d95d58ea9c36d26b96f52c9a7ac4bf92fed2d':
  Tweaks to patchoat and other related things.

10 years agoam 840a873f: am f071e86c: Merge "ART: Use array-inl.h in reference_table_test" into...
Andreas Gampe [Sat, 26 Jul 2014 12:39:33 +0000 (12:39 +0000)]
am 840a873f: am f071e86c: Merge "ART: Use array-inl.h in reference_table_test" into lmp-dev

* commit '840a873f5c8dd556db3bd127ba3c606a83bab3b8':
  ART: Use array-inl.h in reference_table_test

10 years agoam f071e86c: Merge "ART: Use array-inl.h in reference_table_test" into lmp-dev
Andreas Gampe [Sat, 26 Jul 2014 04:18:01 +0000 (04:18 +0000)]
am f071e86c: Merge "ART: Use array-inl.h in reference_table_test" into lmp-dev

* commit 'f071e86c901a230f55e76bc6b55e19cca16a74cb':
  ART: Use array-inl.h in reference_table_test

10 years agoam 0cadcc4b: am 3bcac48f: Merge "ART: Fix run-test 114 ParallelGC to account for...
Andreas Gampe [Fri, 25 Jul 2014 23:54:44 +0000 (23:54 +0000)]
am 0cadcc4b: am 3bcac48f: Merge "ART: Fix run-test 114 ParallelGC to account for OOM"

* commit '0cadcc4b53f260e4e0e2a2ef0c8f4e668a9c1a18':
  ART: Fix run-test 114 ParallelGC to account for OOM

10 years agoam 3bcac48f: Merge "ART: Fix run-test 114 ParallelGC to account for OOM"
Andreas Gampe [Fri, 25 Jul 2014 23:50:07 +0000 (23:50 +0000)]
am 3bcac48f: Merge "ART: Fix run-test 114 ParallelGC to account for OOM"

* commit '3bcac48f23094fa0f46315a080ec47fc368fd4c2':
  ART: Fix run-test 114 ParallelGC to account for OOM

10 years agoam 6a30278b: am 698d79d1: ART: Clean up API after change 102631
Andreas Gampe [Fri, 25 Jul 2014 23:08:45 +0000 (23:08 +0000)]
am 6a30278b: am 698d79d1: ART: Clean up API after change 102631

* commit '6a30278bf73b0db5a5107f6cac445b01a79097a1':
  ART: Clean up API after change 102631

10 years agoam 6995c859: am 4dd37adc: Merge "ART: Clean up API after change 102631"
Andreas Gampe [Fri, 25 Jul 2014 23:08:44 +0000 (23:08 +0000)]
am 6995c859: am 4dd37adc: Merge "ART: Clean up API after change 102631"

* commit '6995c8591f2257ec4e419aed3458a28a960d3ba4':
  ART: Clean up API after change 102631

10 years agoam 698d79d1: ART: Clean up API after change 102631
Andreas Gampe [Fri, 25 Jul 2014 23:04:22 +0000 (23:04 +0000)]
am 698d79d1: ART: Clean up API after change 102631

* commit '698d79d1e3f348102deaa03b5e0fc23641107239':
  ART: Clean up API after change 102631

10 years agoam 4dd37adc: Merge "ART: Clean up API after change 102631"
Andreas Gampe [Fri, 25 Jul 2014 23:04:03 +0000 (23:04 +0000)]
am 4dd37adc: Merge "ART: Clean up API after change 102631"

* commit '4dd37adcf68a72758236ca770272a5597cd84767':
  ART: Clean up API after change 102631

10 years agoART: Clean up API after change 102631
Andreas Gampe [Fri, 25 Jul 2014 20:36:56 +0000 (13:36 -0700)]
ART: Clean up API after change 102631

This adds an abort_on_error parameter to GetCurrentMethod, which is
by default true. This restores all previous behavior, except for
monitor installation, where it follows 101639.

Bug: 16556938

(cherry picked from commit 6ec8ebd178ed39aa09e4c7fad194900114c4121a)

Change-Id: I2dee19d30674f2ffda33b3dc963e12470f39edb9

10 years agoam 0aac1d69: am 9c81c0cb: Merge "Fix main space memory leak and add checks."
Mathieu Chartier [Fri, 25 Jul 2014 19:46:41 +0000 (19:46 +0000)]
am 0aac1d69: am 9c81c0cb: Merge "Fix main space memory leak and add checks."

* commit '0aac1d69999a77d0de68b3f19f231b71452a8ea7':
  Fix main space memory leak and add checks.

10 years agoam 9c81c0cb: Merge "Fix main space memory leak and add checks."
Mathieu Chartier [Fri, 25 Jul 2014 19:39:37 +0000 (19:39 +0000)]
am 9c81c0cb: Merge "Fix main space memory leak and add checks."

* commit '9c81c0cb0dc8c8d8ae5dca3d2d82b0eec7af589f':
  Fix main space memory leak and add checks.

10 years agoam d24091d6: am b2ac1ab4: Fix main space memory leak and add checks.
Mathieu Chartier [Fri, 25 Jul 2014 19:24:02 +0000 (19:24 +0000)]
am d24091d6: am b2ac1ab4: Fix main space memory leak and add checks.

* commit 'd24091d6fe2aa363efca29e44b4dafc89ae47015':
  Fix main space memory leak and add checks.

10 years agoam 3847e645: am 5d790444: Merge "Fix dangling pointer bug when transitioning to backg...
Mathieu Chartier [Fri, 25 Jul 2014 19:24:01 +0000 (19:24 +0000)]
am 3847e645: am 5d790444: Merge "Fix dangling pointer bug when transitioning to background." into lmp-dev

* commit '3847e645ffde285b665de2ae96560afe67b2754f':
  Fix dangling pointer bug when transitioning to background.

10 years agoam b2ac1ab4: Fix main space memory leak and add checks.
Mathieu Chartier [Fri, 25 Jul 2014 19:19:15 +0000 (19:19 +0000)]
am b2ac1ab4: Fix main space memory leak and add checks.

* commit 'b2ac1ab47f84bd989fb2c94a532f5dc7d177ebe4':
  Fix main space memory leak and add checks.

10 years agoam 5d790444: Merge "Fix dangling pointer bug when transitioning to background." into...
Mathieu Chartier [Fri, 25 Jul 2014 19:19:04 +0000 (19:19 +0000)]
am 5d790444: Merge "Fix dangling pointer bug when transitioning to background." into lmp-dev

* commit '5d79044420e2cb03c0cd27c47f834943983aeb4b':
  Fix dangling pointer bug when transitioning to background.

10 years agoam d305c3ad: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googles...
Will Leshner [Fri, 25 Jul 2014 19:18:17 +0000 (19:18 +0000)]
am d305c3ad: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp

* commit 'd305c3ad8ead4e24cee0591dd64f46355e69adfc':

10 years agoam 0545d972: am 3847d663: Merge "Increase limit to 2600 on host clang builds for...
Stephen Hines [Fri, 25 Jul 2014 19:18:17 +0000 (19:18 +0000)]
am 0545d972: am 3847d663: Merge "Increase limit to 2600 on host clang builds for frame size." into lmp-dev

* commit '0545d972cf95bdc58141a585016ca782d1a2274d':
  Increase limit to 2600 on host clang builds for frame size.

10 years agoam b98e0d8a: am d190d989: Merge "Fix dangling pointer bug when transitioning to backg...
Mathieu Chartier [Fri, 25 Jul 2014 19:18:15 +0000 (19:18 +0000)]
am b98e0d8a: am d190d989: Merge "Fix dangling pointer bug when transitioning to background."

* commit 'b98e0d8a3ada42f0eb0cc6749f7edff1431bad1a':
  Fix dangling pointer bug when transitioning to background.

10 years agoam 8cac6317: resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp
Stephen Hines [Fri, 25 Jul 2014 19:18:14 +0000 (19:18 +0000)]
am 8cac6317: resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp

* commit '8cac6317c5301ae1235fcb1e1befa4c6ca3ca185':
  Update frame-larger-than limit to 2440 for new clang.

10 years agoMerge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_dire...
Will Leshner [Fri, 25 Jul 2014 19:12:13 +0000 (19:12 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp

10 years agoam d190d989: Merge "Fix dangling pointer bug when transitioning to background."
Mathieu Chartier [Fri, 25 Jul 2014 19:02:23 +0000 (19:02 +0000)]
am d190d989: Merge "Fix dangling pointer bug when transitioning to background."

* commit 'd190d989ac92d2a5b9a342692564f40bd2080895':
  Fix dangling pointer bug when transitioning to background.

10 years agoam 3847d663: Merge "Increase limit to 2600 on host clang builds for frame size."...
Stephen Hines [Fri, 25 Jul 2014 18:57:53 +0000 (18:57 +0000)]
am 3847d663: Merge "Increase limit to 2600 on host clang builds for frame size." into lmp-dev

* commit '3847d66393a9b14ae9b896543780dc02c038d3fa':
  Increase limit to 2600 on host clang builds for frame size.

10 years agoFix main space memory leak and add checks.
Mathieu Chartier [Fri, 25 Jul 2014 18:50:47 +0000 (11:50 -0700)]
Fix main space memory leak and add checks.

The hypothesis is that we were leaking the main space and its
bitmaps, then eventually we would run out of virtual address space,
which would cause a null bitmap (DCHECK). Finally when we tried
adding the space with a null bitmap to the heap bitmap it segfaulted.

Changed some non performance critical DCHECK -> CHECK.

Bug: 16563323

(cherry picked from commit 2796a1669ae0f3b96db8432fbd8be1b93bf335c4)

Change-Id: Ifa9d866c6c89eff22a547af4db70bc79a77690ed

10 years agoresolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp
Stephen Hines [Fri, 25 Jul 2014 18:53:48 +0000 (11:53 -0700)]
resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp

Change-Id: Ifc9f9fa95dda1dbe60b3be35ef30d2ca707c72d5

10 years agoam 8b605381: am bacabce9: Merge "Add back a deleted check related to verification...
Stephen Hines [Fri, 25 Jul 2014 18:52:58 +0000 (18:52 +0000)]
am 8b605381: am bacabce9: Merge "Add back a deleted check related to verification." into lmp-dev

* commit '8b605381493ad3421bb5f91c1b2cb14a22cb14e2':
  Add back a deleted check related to verification.

10 years agoam d85bd526: Merge "resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp...
Stephen Hines [Fri, 25 Jul 2014 18:52:57 +0000 (18:52 +0000)]
am d85bd526: Merge "resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp" into lmp-dev-plus-aosp

* commit 'd85bd5266effc37650c38e90033ffca2214e86aa':
  Remove errors/warnings from tautological comparisons.

10 years agoam 28c284f2: am 9fbe946f: Merge "Fix JNI compiler frame size adjustments."
Vladimir Marko [Fri, 25 Jul 2014 18:52:57 +0000 (18:52 +0000)]
am 28c284f2: am 9fbe946f: Merge "Fix JNI compiler frame size adjustments."

* commit '28c284f29f8659afe47c426aad6c075cf3e3e05d':
  Fix JNI compiler frame size adjustments.

10 years agoam ec107544: am 1ad334e6: Merge "Rename openDexFileNative to openDexFile."
Narayan Kamath [Fri, 25 Jul 2014 18:52:56 +0000 (18:52 +0000)]
am ec107544: am 1ad334e6: Merge "Rename openDexFileNative to openDexFile."

* commit 'ec107544ed34fe60e24cf5f59165a4d3a98e3951':
  Rename openDexFileNative to openDexFile.

10 years agoam 2307ee06: am 86507ed4: Merge "Add a new stack map scheme that encodes compilation...
Nicolas Geoffray [Fri, 25 Jul 2014 18:52:55 +0000 (18:52 +0000)]
am 2307ee06: am 86507ed4: Merge "Add a new stack map scheme that encodes compilation info per pc."

* commit '2307ee06fd7aa453aa4efb9e964e44e03da9dcbd':
  Add a new stack map scheme that encodes compilation info per pc.

10 years agoam 1174dfe1: am e2f654a4: Merge "ART: Fix wrong CHECK in GetCurrentLocationForThrow"
Andreas Gampe [Fri, 25 Jul 2014 18:52:55 +0000 (18:52 +0000)]
am 1174dfe1: am e2f654a4: Merge "ART: Fix wrong CHECK in GetCurrentLocationForThrow"

* commit '1174dfe12410e9c864113d5c3d0a4bab4482c1e3':
  ART: Fix wrong CHECK in GetCurrentLocationForThrow

10 years agoam c7808809: am b7563b64: Merge "ART: Turn on ART_TEST_KEEP_GOING by default, clean...
Andreas Gampe [Fri, 25 Jul 2014 18:52:54 +0000 (18:52 +0000)]
am c7808809: am b7563b64: Merge "ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars"

* commit 'c7808809c92f756d8b309d40aef7ddce4ae06582':
  ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars

10 years agoam b3c3f938: resolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp
Andreas Gampe [Fri, 25 Jul 2014 18:52:51 +0000 (18:52 +0000)]
am b3c3f938: resolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp

* commit 'b3c3f9384f3ba864baac1ea7d0f7ed6e9c125ff2':
  ART: Relax CurrentMethodVisitor requirements on GetDexPC

10 years agoam bacabce9: Merge "Add back a deleted check related to verification." into lmp-dev
Stephen Hines [Fri, 25 Jul 2014 18:50:20 +0000 (18:50 +0000)]
am bacabce9: Merge "Add back a deleted check related to verification." into lmp-dev

* commit 'bacabce9abe54e67192f835ebd4e013728a2121e':
  Add back a deleted check related to verification.

10 years agoam 9fbe946f: Merge "Fix JNI compiler frame size adjustments."
Vladimir Marko [Fri, 25 Jul 2014 18:45:05 +0000 (18:45 +0000)]
am 9fbe946f: Merge "Fix JNI compiler frame size adjustments."

* commit '9fbe946f49724ff7ae30da5d366a002d1e6addfa':
  Fix JNI compiler frame size adjustments.

10 years agoam 1ad334e6: Merge "Rename openDexFileNative to openDexFile."
Narayan Kamath [Fri, 25 Jul 2014 18:45:04 +0000 (18:45 +0000)]
am 1ad334e6: Merge "Rename openDexFileNative to openDexFile."

* commit '1ad334e6519c274b504c4d5d222c8e40920d02ee':
  Rename openDexFileNative to openDexFile.

10 years agoam 86507ed4: Merge "Add a new stack map scheme that encodes compilation info per...
Nicolas Geoffray [Fri, 25 Jul 2014 18:45:03 +0000 (18:45 +0000)]
am 86507ed4: Merge "Add a new stack map scheme that encodes compilation info per pc."

* commit '86507ed48af6046ee9e5bc84daeb795fc8acc3bf':
  Add a new stack map scheme that encodes compilation info per pc.

10 years agoam e2f654a4: Merge "ART: Fix wrong CHECK in GetCurrentLocationForThrow"
Andreas Gampe [Fri, 25 Jul 2014 18:45:00 +0000 (18:45 +0000)]
am e2f654a4: Merge "ART: Fix wrong CHECK in GetCurrentLocationForThrow"

* commit 'e2f654a463976f811c5358fc0de68c0492601274':
  ART: Fix wrong CHECK in GetCurrentLocationForThrow

10 years agoam b7563b64: Merge "ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused...
Andreas Gampe [Fri, 25 Jul 2014 18:44:59 +0000 (18:44 +0000)]
am b7563b64: Merge "ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars"

* commit 'b7563b641059bcff82eb4624edb806a7ce7f39c0':
  ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars

10 years agoresolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp
Andreas Gampe [Fri, 25 Jul 2014 18:38:28 +0000 (11:38 -0700)]
resolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp

Change-Id: If49761765f3346993fb67068e79dad65e161c6a5

10 years agoam 749647c9: am ee2d1ada: Fix JNI compiler frame size adjustments.
Vladimir Marko [Fri, 25 Jul 2014 15:56:21 +0000 (15:56 +0000)]
am 749647c9: am ee2d1ada: Fix JNI compiler frame size adjustments.

* commit '749647c974791ce91e179e465f0b275d6cf54111':
  Fix JNI compiler frame size adjustments.

10 years agoam ee2d1ada: Fix JNI compiler frame size adjustments.
Vladimir Marko [Fri, 25 Jul 2014 15:51:39 +0000 (15:51 +0000)]
am ee2d1ada: Fix JNI compiler frame size adjustments.

* commit 'ee2d1ada2b9d0400e56c63656f9abfbccc880377':
  Fix JNI compiler frame size adjustments.

10 years agoFix JNI compiler frame size adjustments.
Vladimir Marko [Thu, 24 Jul 2014 16:01:58 +0000 (17:01 +0100)]
Fix JNI compiler frame size adjustments.

Bug: 16321952

(cherry picked from 4e24b9da7c5ea6e517ecdbc09aa14a0995100b7e)

Change-Id: I486b7ad7ebefc7db9b56fe92809ef495c316292b

10 years agoam 51cc4322: am 195bb33e: Merge "ART: Account for multidex location strings in VMClas...
Andreas Gampe [Fri, 25 Jul 2014 12:46:23 +0000 (12:46 +0000)]
am 51cc4322: am 195bb33e: Merge "ART: Account for multidex location strings in VMClassLoader"

* commit '51cc4322e50f73559212abc7aeafe6e5ad4948ad':
  ART: Account for multidex location strings in VMClassLoader

10 years agoam 195bb33e: Merge "ART: Account for multidex location strings in VMClassLoader"
Andreas Gampe [Fri, 25 Jul 2014 12:41:18 +0000 (12:41 +0000)]
am 195bb33e: Merge "ART: Account for multidex location strings in VMClassLoader"

* commit '195bb33e08f262bde1e4367f14690f8328653ab6':
  ART: Account for multidex location strings in VMClassLoader

10 years agoam 829cfffd: am 6d5e82f7: ART: Fix wrong CHECK in GetCurrentLocationForThrow
Andreas Gampe [Fri, 25 Jul 2014 12:38:41 +0000 (12:38 +0000)]
am 829cfffd: am 6d5e82f7: ART: Fix wrong CHECK in GetCurrentLocationForThrow

* commit '829cfffdfccb25361b479e9799cf3ae18fed5c3a':
  ART: Fix wrong CHECK in GetCurrentLocationForThrow

10 years agoam c6dfd89a: am b3ec51e6: ART: Relax CurrentMethodVisitor requirements on GetDexPC
Andreas Gampe [Fri, 25 Jul 2014 12:38:40 +0000 (12:38 +0000)]
am c6dfd89a: am b3ec51e6: ART: Relax CurrentMethodVisitor requirements on GetDexPC

* commit 'c6dfd89a8015ce8894f48a9881a6dc77ebcc6a13':
  ART: Relax CurrentMethodVisitor requirements on GetDexPC

10 years agoam 6380efcb: am 9157c0ca: ART: Account for multidex location strings in VMClassLoader
Andreas Gampe [Fri, 25 Jul 2014 12:38:39 +0000 (12:38 +0000)]
am 6380efcb: am 9157c0ca: ART: Account for multidex location strings in VMClassLoader

* commit '6380efcb50fcefeca53de6ff2f376314516f6e41':
  ART: Account for multidex location strings in VMClassLoader

10 years agoam 6d5e82f7: ART: Fix wrong CHECK in GetCurrentLocationForThrow
Andreas Gampe [Fri, 25 Jul 2014 12:25:59 +0000 (12:25 +0000)]
am 6d5e82f7: ART: Fix wrong CHECK in GetCurrentLocationForThrow

* commit '6d5e82f78d7b121a33f935521e0a7f5335cab213':
  ART: Fix wrong CHECK in GetCurrentLocationForThrow

10 years agoam b3ec51e6: ART: Relax CurrentMethodVisitor requirements on GetDexPC
Andreas Gampe [Fri, 25 Jul 2014 12:25:58 +0000 (12:25 +0000)]
am b3ec51e6: ART: Relax CurrentMethodVisitor requirements on GetDexPC

* commit 'b3ec51e63c5041f77389ee001b47a8897b2a7acc':
  ART: Relax CurrentMethodVisitor requirements on GetDexPC

10 years agoam 9157c0ca: ART: Account for multidex location strings in VMClassLoader
Andreas Gampe [Fri, 25 Jul 2014 12:25:53 +0000 (12:25 +0000)]
am 9157c0ca: ART: Account for multidex location strings in VMClassLoader

* commit '9157c0ca6a57fa9f6378aebcfb2e3ff76622499a':
  ART: Account for multidex location strings in VMClassLoader

10 years agoART: Fix wrong CHECK in GetCurrentLocationForThrow
Andreas Gampe [Fri, 25 Jul 2014 10:07:06 +0000 (03:07 -0700)]
ART: Fix wrong CHECK in GetCurrentLocationForThrow

Under certain circumstances kDexNoIndex is actually an encoded
dex pc. Change the setup of CurrentMethodVisitor to account for that.

Bug: 16556938

(cherry picked from commit f9df5c1639a9418fcdf70476556a4c30b210701e)

Change-Id: Icb1d42ccd22296e2e0c629ebbd7e4d8c7d87f07a

10 years agoART: Relax CurrentMethodVisitor requirements on GetDexPC
Andreas Gampe [Thu, 17 Jul 2014 05:20:31 +0000 (22:20 -0700)]
ART: Relax CurrentMethodVisitor requirements on GetDexPC

In case we want to dump a Java stack after an unhandled fault, in
case we hold a thinlocked monitor, that monitor might get inflated.
That can cause an abort as we may not have enough/correct information
for the state at the bottom-most call.

Relax GetDexPc in the CurrentMethodVisitor to not abort when it cannot
find a dex pc. Instead, let the caller handle such a case. This CL
allows the locking_dex_pc_ in Monitor to be DexFile::kDexNoIndex,
which avoids the above abort.

Bug: 1635280216556938

(cherry picked from commit 4a8c3fa4bd8d95fac5671ab778dd00b6dc3ec0e4)

Change-Id: I60d3d89603de65752d9230ceac6abb0242388c18

10 years agoART: Account for multidex location strings in VMClassLoader
Andreas Gampe [Thu, 24 Jul 2014 22:35:50 +0000 (15:35 -0700)]
ART: Account for multidex location strings in VMClassLoader

To look up resources, look in the unadorned location.

Bug: 16530747

(cherry picked from commit cb8f9e8a2941971c049b26745ea713c859342d9b)

Change-Id: I5dce30c5e3c9f38fb5436c43a3f4a51fe4062c24

10 years agoam e751e9a4: am 4857b868: Merge "Integrate ART with NativeBridge interfaces"
Andreas Gampe [Fri, 25 Jul 2014 04:15:50 +0000 (04:15 +0000)]
am e751e9a4: am 4857b868: Merge "Integrate ART with NativeBridge interfaces"

* commit 'e751e9a47a586c112dc606ea233f3307cb343618':
  Integrate ART with NativeBridge interfaces

10 years agoam 4857b868: Merge "Integrate ART with NativeBridge interfaces"
Andreas Gampe [Fri, 25 Jul 2014 04:09:24 +0000 (04:09 +0000)]
am 4857b868: Merge "Integrate ART with NativeBridge interfaces"

* commit '4857b868f7d5941255afc847c07f49ae496d0e1c':
  Integrate ART with NativeBridge interfaces

10 years agoam 32de2140: am c0dcf291: Fix stale remembered sets error.
Mathieu Chartier [Thu, 24 Jul 2014 23:51:35 +0000 (23:51 +0000)]
am 32de2140: am c0dcf291: Fix stale remembered sets error.

* commit '32de214054f510286a277bb8c8a375a1178d13f9':
  Fix stale remembered sets error.

10 years agoam 56aa8922: am 5dc158e9: Fix access to long/double stack values from debugger
Sebastien Hertz [Thu, 24 Jul 2014 23:51:28 +0000 (23:51 +0000)]
am 56aa8922: am 5dc158e9: Fix access to long/double stack values from debugger

* commit '56aa89229481bbabd243867b07a6b74ff072d7af':
  Fix access to long/double stack values from debugger

10 years agoam c0dcf291: Fix stale remembered sets error.
Mathieu Chartier [Thu, 24 Jul 2014 23:33:21 +0000 (23:33 +0000)]
am c0dcf291: Fix stale remembered sets error.

* commit 'c0dcf29143051cf34d6c032a7b385ac4579bd4ec':
  Fix stale remembered sets error.

10 years agoam 5dc158e9: Fix access to long/double stack values from debugger
Sebastien Hertz [Thu, 24 Jul 2014 23:30:54 +0000 (23:30 +0000)]
am 5dc158e9: Fix access to long/double stack values from debugger

* commit '5dc158e9b6635b6c5d3916ae4094e8886feb4580':
  Fix access to long/double stack values from debugger

10 years agoMerge "Fix main space memory leak and add checks."
Mathieu Chartier [Fri, 25 Jul 2014 19:06:45 +0000 (19:06 +0000)]
Merge "Fix main space memory leak and add checks."

10 years agoFix main space memory leak and add checks.
Mathieu Chartier [Fri, 25 Jul 2014 18:50:47 +0000 (11:50 -0700)]
Fix main space memory leak and add checks.

The hypothesis is that we were leaking the main space and its
bitmaps, then eventually we would run out of virtual address space,
which would cause a null bitmap (DCHECK). Finally when we tried
adding the space with a null bitmap to the heap bitmap it segfaulted.

Changed some non performance critical DCHECK -> CHECK.

Bug: 16563323
Change-Id: I08a1f873752e28ebcf63ebbd90f92d994d7ca96b

10 years agoMerge "Fix dangling pointer bug when transitioning to background."
Mathieu Chartier [Fri, 25 Jul 2014 18:42:53 +0000 (18:42 +0000)]
Merge "Fix dangling pointer bug when transitioning to background."

10 years agoFix dangling pointer bug when transitioning to background.
Mathieu Chartier [Fri, 25 Jul 2014 17:13:51 +0000 (10:13 -0700)]
Fix dangling pointer bug when transitioning to background.

Dangling pointer left behind from the old rosalloc / dlmalloc
spaces. We now avoid using this pointer by using main_space_
and non_moving_space_ as well as clear the pointer when we remove
the space.

Bug: 16567203

Change-Id: Ida9ff30783e89cd4a4d86a4d0e912701692101f1

10 years agoMerge "Fix dangling pointer bug when transitioning to background." into lmp-dev
Mathieu Chartier [Fri, 25 Jul 2014 18:50:34 +0000 (18:50 +0000)]
Merge "Fix dangling pointer bug when transitioning to background." into lmp-dev

10 years agoFix dangling pointer bug when transitioning to background.
Mathieu Chartier [Fri, 25 Jul 2014 17:13:51 +0000 (10:13 -0700)]
Fix dangling pointer bug when transitioning to background.

Dangling pointer left behind from the old rosalloc / dlmalloc
spaces. We now avoid using this pointer by using main_space_
and non_moving_space_ as well as clear the pointer when we remove
the space.

Bug: 16567203

(cherry picked from commit 00b5915828f89daaefd9e8fb215658360f76762c)

Change-Id: I5962929e4a0bb4db6f531d25ee322da7ab3f5dd4

10 years agoMerge "resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp" into lmp-dev...
Stephen Hines [Fri, 25 Jul 2014 18:48:31 +0000 (18:48 +0000)]
Merge "resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp" into lmp-dev-plus-aosp

10 years agoresolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp
Stephen Hines [Fri, 25 Jul 2014 18:44:37 +0000 (11:44 -0700)]
resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp

Change-Id: I22a24179518bf5de94a22b21cb4c86fce3e012e6

10 years agoMerge "Remove errors/warnings from tautological comparisons." into lmp-dev
Stephen Hines [Fri, 25 Jul 2014 17:27:58 +0000 (17:27 +0000)]
Merge "Remove errors/warnings from tautological comparisons." into lmp-dev

10 years agoRemove errors/warnings from tautological comparisons.
Stephen Hines [Wed, 16 Jul 2014 04:41:06 +0000 (21:41 -0700)]
Remove errors/warnings from tautological comparisons.

Change-Id: I2728b08d55abccd14c111c6c9da93068d4e14275

10 years agoam 338eb238: am 54f3c041: Merge "Fix memory leak in RemoveRememberedSet."
Mathieu Chartier [Thu, 24 Jul 2014 21:00:08 +0000 (21:00 +0000)]
am 338eb238: am 54f3c041: Merge "Fix memory leak in RemoveRememberedSet."

* commit '338eb2386f251d949fdf54c9cde130b2496e6319':
  Fix memory leak in RemoveRememberedSet.

10 years agoMerge "Integrate ART with NativeBridge interfaces"
Andreas Gampe [Fri, 25 Jul 2014 04:01:32 +0000 (04:01 +0000)]
Merge "Integrate ART with NativeBridge interfaces"

10 years agoIntegrate ART with NativeBridge interfaces
Yong WU [Thu, 24 Jul 2014 13:32:15 +0000 (21:32 +0800)]
Integrate ART with NativeBridge interfaces

Native-bridge will provide the following interfaces to ART:

struct NativeBridgeCallbacks {
  bool  (*initialize   )(NativeBridgeArtCallbacks* vm_itf);
  void* (*loadLibrary  )(const char* libpath, int flag);
  void* (*getTrampoline)(void* handle, const char* name, const char* shorty,
                         uint32_t len);
  bool  (*isSupported  )(const char* libpath);
};

Native-bridge will expose a symbol NativeBridgeItf with the
type of NativeBridgeCallbacks to ART.

And ART will provide the interfaces below to native-bridge:

struct NativeBridgeArtCallbacks {
  int   (*logger               )(int prio, const char* tag, const char* fmt, ...);
  const char* (*getMethodShorty)(JNIEnv* env, jmethodID mid);
  int   (*getNativeMethodCount )(JNIEnv* env, jclass clazz);
  int   (*getNativeMethods     )(JNIEnv* env, jclass clazz, JNINativeMethod* methods,
                                 uint32_t method_count);
};

Based on the interfaces, if an ART call to dlopen fails to open a native library,
it queries the native bridge by using NativeBridgeCallbacks::isSupported(). If the
native library is supported by native-bridge, ART can load the native library
using NativeBridgeCallbacks::loadLibrary() and get a trampoline for a specific
native method using NativeBridgeCallbacks::getTrampoline(). ART can then call
the native method using the normal signature and the address of the trampoline.

On the other side, in the case of a native method calling JNI native function
CallXXXXMethodY(), native-bridge calls back to Art for the shorty of the method
using NativeBridgeArtCallbacks::getMethodShorty() so that it can prepare based
on host calling convention.

In case of JNI function RegisterNatives()/UnregisterNatives(), native bridge can
call back to NativeBridgeArtCallbacks::getNativeMethodCount() and NativeBridgeArtCallbacks
::getNativeMethods() to get all native methods of specified class so that all
corresponding trampolines can be prepared/destroyed.

Class NativeBridge is created to encapsulate the function pointers of
NativeBridgeCallbacks and provides better abstraction to ART.

Note: functionality is turned off in native_bridge.cc at the moment.

Change-Id: I652755044957a7960254648652b538cce70dd011

10 years agoam 54f3c041: Merge "Fix memory leak in RemoveRememberedSet."
Mathieu Chartier [Thu, 24 Jul 2014 20:55:16 +0000 (20:55 +0000)]
am 54f3c041: Merge "Fix memory leak in RemoveRememberedSet."

* commit '54f3c041365647fc79260b65e70b4290d0b50f1c':
  Fix memory leak in RemoveRememberedSet.

10 years agoMerge "Increase limit to 2600 on host clang builds for frame size." into lmp-dev
Stephen Hines [Fri, 25 Jul 2014 17:28:14 +0000 (17:28 +0000)]
Merge "Increase limit to 2600 on host clang builds for frame size." into lmp-dev

10 years agoIncrease limit to 2600 on host clang builds for frame size.
Stephen Hines [Thu, 24 Jul 2014 02:47:35 +0000 (19:47 -0700)]
Increase limit to 2600 on host clang builds for frame size.

Change-Id: I573e1bcdc7a935145e88077def9c90a5573d2e90

10 years agoUpdate frame-larger-than limit to 2440 for new clang.
Stephen Hines [Thu, 17 Jul 2014 08:49:18 +0000 (01:49 -0700)]
Update frame-larger-than limit to 2440 for new clang.

Bug: 16362912

The latest version of clang is generating larger frames on elf_writer_quick.cc
and dex2oat.cc than we had previously encountered. This change unblocks the
LLVM rebase temporarily.

Change-Id: I20d9f88959b91e0509e58f01c22532720225f44d

10 years agoAdd back a deleted check related to verification.
Stephen Hines [Wed, 16 Jul 2014 18:03:43 +0000 (11:03 -0700)]
Add back a deleted check related to verification.

Change-Id: Ib939d1a7395a4b6cc9a7256cfb0a3498ba296744

10 years agoMerge "Update frame-larger-than limit to 2440 for new clang." into lmp-dev
Stephen Hines [Fri, 25 Jul 2014 17:28:09 +0000 (17:28 +0000)]
Merge "Update frame-larger-than limit to 2440 for new clang." into lmp-dev

10 years agoMerge "Add back a deleted check related to verification." into lmp-dev
Stephen Hines [Fri, 25 Jul 2014 17:28:04 +0000 (17:28 +0000)]
Merge "Add back a deleted check related to verification." into lmp-dev

10 years agoam fcc91b80: resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp
Andreas Gampe [Thu, 24 Jul 2014 19:48:27 +0000 (19:48 +0000)]
am fcc91b80: resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp

* commit 'fcc91b80ae77827726ab93d237f794f87b97a2e6':
  ART: Refactor GenSelect, refactor gen_common accordingly

10 years agoresolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp
Andreas Gampe [Thu, 24 Jul 2014 19:38:06 +0000 (12:38 -0700)]
resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp

10 years agoam b8eb3ad3: am d68168e9: Merge "ART: Do not attempt to compile a method with too...
Andreas Gampe [Thu, 24 Jul 2014 19:26:54 +0000 (19:26 +0000)]
am b8eb3ad3: am d68168e9: Merge "ART: Do not attempt to compile a method with too many registers" into lmp-dev

* commit 'b8eb3ad343be4fbef8b90225f52f4776303289be':
  ART: Do not attempt to compile a method with too many registers

10 years agoam 337dfe0d: am 1f710373: Merge "ART: Check high part of dalvik register pairs on...
Andreas Gampe [Thu, 24 Jul 2014 19:26:53 +0000 (19:26 +0000)]
am 337dfe0d: am 1f710373: Merge "ART: Check high part of dalvik register pairs on put-wide" into lmp-dev

* commit '337dfe0db204e7cfc6743046c7c11e08e3e3de32':
  ART: Check high part of dalvik register pairs on put-wide

10 years agoam 15b707b6: am 0f45f22e: (-s ours) ART: Throw StackOverflowError in native code
Andreas Gampe [Thu, 24 Jul 2014 19:26:52 +0000 (19:26 +0000)]
am 15b707b6: am 0f45f22e: (-s ours) ART: Throw StackOverflowError in native code

* commit '15b707b6d627976f34626d11da51c25046a04612':
  ART: Throw StackOverflowError in native code

10 years agoam d68168e9: Merge "ART: Do not attempt to compile a method with too many registers...
Andreas Gampe [Thu, 24 Jul 2014 19:23:46 +0000 (19:23 +0000)]
am d68168e9: Merge "ART: Do not attempt to compile a method with too many registers" into lmp-dev

* commit 'd68168e9f0c416a3ef29d9b9504ae436fa482c44':
  ART: Do not attempt to compile a method with too many registers

10 years agoam 1f710373: Merge "ART: Check high part of dalvik register pairs on put-wide" into...
Andreas Gampe [Thu, 24 Jul 2014 19:23:44 +0000 (19:23 +0000)]
am 1f710373: Merge "ART: Check high part of dalvik register pairs on put-wide" into lmp-dev

* commit '1f7103731d5a13925fbb6730d4f65d2a314c9e6d':
  ART: Check high part of dalvik register pairs on put-wide

10 years agoam 0f45f22e: (-s ours) ART: Throw StackOverflowError in native code
Andreas Gampe [Thu, 24 Jul 2014 19:23:44 +0000 (19:23 +0000)]
am 0f45f22e: (-s ours) ART: Throw StackOverflowError in native code

* commit '0f45f22eb3c52f0ece4c56989180e79c6680d825':
  ART: Throw StackOverflowError in native code

10 years agoam 204e57c4: resolved conflicts for merge of 7521704f to lmp-dev-plus-aosp
Mathieu Chartier [Thu, 24 Jul 2014 18:32:20 +0000 (18:32 +0000)]
am 204e57c4: resolved conflicts for merge of 7521704f to lmp-dev-plus-aosp

* commit '204e57c43824413d6e15fdf05c490ed4d869d44e':
  Fix stale remembered sets error.

10 years agoresolved conflicts for merge of 7521704f to lmp-dev-plus-aosp
Mathieu Chartier [Thu, 24 Jul 2014 18:27:04 +0000 (11:27 -0700)]
resolved conflicts for merge of 7521704f to lmp-dev-plus-aosp

Change-Id: Id4fe1e4c222c79a9b743e267ddca407976295248

10 years agoFix stale remembered sets error.
Mathieu Chartier [Thu, 24 Jul 2014 01:45:17 +0000 (18:45 -0700)]
Fix stale remembered sets error.

We were forgetting to remove the remembered set in transition to
background. This resulted in remembered sets being added for
spaces which no longer existed. This finally caused an error when
a new space happened to have the same address as the old space,
resulting in a CHECK failure.

Also tuned the number of ParallelGC to prevent spurrious failures
and removed the ParallelGC from broken tests in the make file.

Bug: 16532086
Bug: 16406852

Change-Id: I00bbcbd7daa03c867732d165be62b72e6c43bce1

(cherry picked from c5a8347ac491a5f521945d3835a322123830456b)

10 years agoMerge "ART: Use array-inl.h in reference_table_test" into lmp-dev
Andreas Gampe [Sat, 26 Jul 2014 04:08:40 +0000 (04:08 +0000)]
Merge "ART: Use array-inl.h in reference_table_test" into lmp-dev

10 years agoART: Use array-inl.h in reference_table_test
Andreas Gampe [Thu, 17 Jul 2014 21:52:06 +0000 (14:52 -0700)]
ART: Use array-inl.h in reference_table_test

The test allocates arrays, which is an inline definition.

(cherry picked from commit 8db4c882a8d1996852163ebec966c8b4eb1e00df)

Change-Id: I1423c5419949d7c352ed0e614d4f9c5920831deb

10 years agoam 797517aa: am ca928ba8: Merge "Fix access to long/double stack values from debugger"
Sebastien Hertz [Thu, 24 Jul 2014 13:06:00 +0000 (13:06 +0000)]
am 797517aa: am ca928ba8: Merge "Fix access to long/double stack values from debugger"

* commit '797517aa6226f5f34ea70d0963e703ce888b5726':
  Fix access to long/double stack values from debugger

10 years agoam ca928ba8: Merge "Fix access to long/double stack values from debugger"
Sebastien Hertz [Thu, 24 Jul 2014 12:56:31 +0000 (12:56 +0000)]
am ca928ba8: Merge "Fix access to long/double stack values from debugger"

* commit 'ca928ba8b9e109ced2b9d72622dc34bda63ac211':
  Fix access to long/double stack values from debugger

10 years agoFix access to long/double stack values from debugger
Sebastien Hertz [Wed, 16 Jul 2014 09:56:07 +0000 (11:56 +0200)]
Fix access to long/double stack values from debugger

Long and double values live in a pair of DEX registers. When we compile DEX
code with the Quick compiler, a DEX register either lives in the stack or is
promoted to a physical register. In the case of a pair of DEX registers, the
Quick compiler assumes both registers live in the same "area": both live in
the stack or both are promoted to physical registers.

From the debugger, we used to access these values by reading/writing each DEX
register separately. However, this does not work when only one DEX register of
a pair is promoted and the other lives in the stack. In this case, the compiled
code reads from/writes to the stack only.

To fix that, the debugger must follow the same rule than the Quick compiler: if
both DEX registers are promoted, read/write them from/to physical registers,
otherwise read/write them from/to the stack. We add StackVisitor:GetVRegPair and
StackVisitor:SetVRegPair for this purpose.

We also follow the same rule when deoptimizing. However we need to do that only
when we know two consecutive DEX registers are part of a pair (long or double).
We know that thanks to the verifier.

Bug: 15527793

(cherry picked from commit c901dd7bdc80b953d04100ef2f54b8d1ca5f466b)

Change-Id: I981e088295254d75352f83a3e6ba0b292cfe3ed3

10 years agoam 118dbba9: am 3017527b: Merge "Increase limit to 2600 on host clang builds for...
Stephen Hines [Thu, 24 Jul 2014 03:00:02 +0000 (03:00 +0000)]
am 118dbba9: am 3017527b: Merge "Increase limit to 2600 on host clang builds for frame size."

* commit '118dbba980cb2cf9dba5bad7d5ef32b6bba12abe':
  Increase limit to 2600 on host clang builds for frame size.

10 years agoam 3017527b: Merge "Increase limit to 2600 on host clang builds for frame size."
Stephen Hines [Thu, 24 Jul 2014 02:57:47 +0000 (02:57 +0000)]
am 3017527b: Merge "Increase limit to 2600 on host clang builds for frame size."

* commit '3017527bf4ceced296b8885426b86ac939ab755f':
  Increase limit to 2600 on host clang builds for frame size.

10 years agoam 50985c8f: am 7f9c8f7b: Merge "Update frame-larger-than limit to 2440 for new clang."
Stephen Hines [Thu, 24 Jul 2014 02:29:33 +0000 (02:29 +0000)]
am 50985c8f: am 7f9c8f7b: Merge "Update frame-larger-than limit to 2440 for new clang."

* commit '50985c8fe8e390e665d2207e01631f5d47e2fa14':
  Update frame-larger-than limit to 2440 for new clang.