diff options
| author | 2018-05-25 12:43:17 +0000 | |
|---|---|---|
| committer | 2018-05-25 12:43:17 +0000 | |
| commit | a326807d1ac1e37798c928911777c9d7c1d7ab4d (patch) | |
| tree | d1d60c9c0ded7b8c99977c19830225218d55ff3e /compiler/optimizing/nodes.cc | |
| parent | 8967547e8d27e63332839540a8b0f53f0d95b46c (diff) | |
| parent | c7aa87e1666ac48ddf9149cfdfd64b026b3969e5 (diff) | |
Merge changes Iaf172f37,I15a8ade7,Icbc6b62b
* changes:
Remove static_class_ from Method/VarHandle and CallSite.
Remove PrimitiveArray<T>::array_class_.
Refactor ClassRoot/GetClassRoot().
Diffstat (limited to 'compiler/optimizing/nodes.cc')
| -rw-r--r-- | compiler/optimizing/nodes.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 55496602d2..ef8a757ad0 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -22,6 +22,7 @@ #include "base/bit_vector-inl.h" #include "base/stl_util.h" #include "class_linker-inl.h" +#include "class_root.h" #include "code_generator.h" #include "common_dominator.h" #include "intrinsics.h" @@ -40,9 +41,8 @@ static constexpr bool kEnableFloatingPointStaticEvaluation = (FLT_EVAL_METHOD == void HGraph::InitializeInexactObjectRTI(VariableSizedHandleScope* handles) { ScopedObjectAccess soa(Thread::Current()); // Create the inexact Object reference type and store it in the HGraph. - ClassLinker* linker = Runtime::Current()->GetClassLinker(); inexact_object_rti_ = ReferenceTypeInfo::Create( - handles->NewHandle(linker->GetClassRoot(ClassLinker::kJavaLangObject)), + handles->NewHandle(GetClassRoot<mirror::Object>()), /* is_exact */ false); } |