commit c0f02d4846846d644bfa4bb606aa26411c0be31d
author Neil Fuller <nfuller@google.com> Mon Jun 11 09:49:01 2018 +0000
committer Neil Fuller <nfuller@google.com> Mon Jun 11 12:34:18 2018 +0000
tree ea007db13f31492cab58adea297422b361e8af24
parent d80668611e1982d50374da03377542a7863ba8e5

Revert "Add Throwable.UNASSIGNED_STACK to well known fields"

This reverts commit d80668611e1982d50374da03377542a7863ba8e5.

Reason for revert: Appears to break Serialization of some Throwable subclasses.

Bug: 35910877
Bug: 109930347
Change-Id: Ic78e63229f946175c629ae76b82a277ed5f12e0f

runtime/common_throws.cc

diff --git a/runtime/common_throws.cc b/runtime/common_throws.cc
index 2ffadb3..657a78b 100644
--- a/runtime/common_throws.cc
+++ b/runtime/common_throws.cc
@@ -787,7 +787,7 @@
     //   Object stackState;
     //   StackTraceElement[] stackTrace;
     // Only Throwable has a non-empty constructor:
-    //   this.stackTrace = Throwable.UNASSIGNED_STACK;
+    //   this.stackTrace = EmptyArray.STACK_TRACE_ELEMENT;
     //   fillInStackTrace();
 
     // detailMessage.
@@ -822,8 +822,8 @@
 
         // stackTrace.
         ScopedLocalRef<jobject> stack_trace_elem(env, env->GetStaticObjectField(
-            WellKnownClasses::java_lang_Throwable,
-            WellKnownClasses::java_lang_Throwable_UNASSIGNED_STACK));
+            WellKnownClasses::libcore_util_EmptyArray,
+            WellKnownClasses::libcore_util_EmptyArray_STACK_TRACE_ELEMENT));
         env->SetObjectField(exc.get(),
                             WellKnownClasses::java_lang_Throwable_stackTrace,
                             stack_trace_elem.get());