commit b05bf89967e904fcde3da871704b0bed3a012958
author Nikita Iashchenko <nikitai@google.com> Mon Sep 06 23:48:36 2021 +0100
committer Nikita Iashchenko <nikitai@google.com> Tue Sep 07 14:22:49 2021 +0000
tree b535087be5ce6c080803c358c33f7ed8134484ea
parent d8c0ac264f606bf0c69781388ca6048eb0a4b55f

OpenJDK 11: Move math classes from sun.misc.* to jdk.internal.math

This is part of merging upstream changes from OpenJDK 11.28. This CL
updates tests for FloatingDecimal that was moved from sun.misc to
jdk.internal.math.

Bug: 199067710
Test: m droid
Change-Id: Ic5d0888029fbdd0e4b3605fa8a99f7f674d204a1

runtime/interpreter/unstarted_runtime.cc

diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc
index de9e965..5a9d504 100644
--- a/runtime/interpreter/unstarted_runtime.cc
+++ b/runtime/interpreter/unstarted_runtime.cc
@@ -1064,9 +1064,9 @@
 
 void UnstartedRuntime::UnstartedThreadLocalGet(
     Thread* self, ShadowFrame* shadow_frame, JValue* result, size_t arg_offset ATTRIBUTE_UNUSED) {
-  if (CheckCallers(shadow_frame, { "sun.misc.FloatingDecimal$BinaryToASCIIBuffer "
-                                       "sun.misc.FloatingDecimal.getBinaryToASCIIBuffer()" })) {
-    result->SetL(CreateInstanceOf(self, "Lsun/misc/FloatingDecimal$BinaryToASCIIBuffer;"));
+  if (CheckCallers(shadow_frame, { "jdk.internal.math.FloatingDecimal$BinaryToASCIIBuffer "
+                                       "jdk.internal.math.FloatingDecimal.getBinaryToASCIIBuffer()" })) {
+    result->SetL(CreateInstanceOf(self, "Ljdk/internal/math/FloatingDecimal$BinaryToASCIIBuffer;"));
   } else {
     AbortTransactionOrFail(self,
                            "ThreadLocal.get() does not support %s",

runtime/interpreter/unstarted_runtime_test.cc

diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc
index f37fd45..75a692e 100644
--- a/runtime/interpreter/unstarted_runtime_test.cc
+++ b/runtime/interpreter/unstarted_runtime_test.cc
@@ -947,14 +947,14 @@
   {
     Handle<mirror::Class> floating_decimal = hs.NewHandle(
         class_linker->FindClass(self,
-                                "Lsun/misc/FloatingDecimal;",
+                                "Ljdk/internal/math/FloatingDecimal;",
                                 ScopedNullHandle<mirror::ClassLoader>()));
     ASSERT_TRUE(floating_decimal != nullptr);
     ASSERT_TRUE(class_linker->EnsureInitialized(self, floating_decimal, true, true));
 
     ArtMethod* caller_method = floating_decimal->FindClassMethod(
         "getBinaryToASCIIBuffer",
-        "()Lsun/misc/FloatingDecimal$BinaryToASCIIBuffer;",
+        "()Ljdk/internal/math/FloatingDecimal$BinaryToASCIIBuffer;",
         class_linker->GetImagePointerSize());
     // floating_decimal->DumpClass(LOG_STREAM(ERROR), mirror::Class::kDumpClassFullDetail);
     ASSERT_TRUE(caller_method != nullptr);