From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 3 Feb 2015 10:10:52 +0000 (+0000)
Subject: Revert "Revert "ART: Make 074-gc-thrash more OOME tolerant""
X-Git-Tag: android-x86-7.1-r1~889^2~2075^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=67f65ea9ca0826ff16397694bfb9c4858a958453;p=android-x86%2Fart.git

Revert "Revert "ART: Make 074-gc-thrash more OOME tolerant""

This reverts commit ed8b53d679d46891d8d405b0ce4a48c282d872f7.

This wasn't the reason for breakage. Instead, it was the Makefile change in:
https://android-review.googlesource.com/#/c/128250/

Change-Id: Ib94870c1eccbe821e3b4945ea92ca35ca0a8a9b9
---

diff --git a/test/074-gc-thrash/src/Main.java b/test/074-gc-thrash/src/Main.java
index 32fbf2d10..238e73a6b 100644
--- a/test/074-gc-thrash/src/Main.java
+++ b/test/074-gc-thrash/src/Main.java
@@ -292,8 +292,8 @@ class Deep extends Thread {
                     break;
             }
 
-            strong[depth] = funStr;
             weak[depth] = new WeakReference(funStr);
+            strong[depth] = funStr;
             if (depth+1 < MAX_DEPTH)
                 dive(depth+1, iteration+1);
             else