diff options
| author | Ian Rogers <irogers@google.com> | 2014-04-28 16:47:08 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-04-29 14:36:28 -0700 |
| commit | b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf (patch) | |
| tree | 839d13ebfa7170967dd9b4abd434b7abda53da99 /runtime/interpreter/interpreter.cc | |
| parent | 948740c1938860df055ddc801f20fd1707331e38 (diff) | |
| download | art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.tar.gz art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.tar.bz2 art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.zip | |
Force inlining on trivial accessors.
Make volatility for GetFieldObject a template parameter.
Move some trivial mirror::String routines to a -inl.h.
Bug: 14285442
Change-Id: Ie23b11d4f18cb15a62c3bbb42837a8aaf6b68f92
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index e3f3cd0ab..3c6c225c6 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -15,8 +15,11 @@ */ #include "interpreter_common.h" + #include <limits> +#include "mirror/string-inl.h" + namespace art { namespace interpreter { @@ -85,7 +88,7 @@ static void UnstartedRuntimeJni(Thread* self, ArtMethod* method, Object* obj = reinterpret_cast<Object*>(args[0]); jlong offset = (static_cast<uint64_t>(args[2]) << 32) | args[1]; Object* newValue = reinterpret_cast<Object*>(args[3]); - obj->SetFieldObject<true>(MemberOffset(offset), newValue, false); + obj->SetFieldObject<true>(MemberOffset(offset), newValue); } else if (name == "int sun.misc.Unsafe.getArrayBaseOffsetForComponentType(java.lang.Class)") { mirror::Class* component = reinterpret_cast<Object*>(args[0])->AsClass(); Primitive::Type primitive_type = component->GetPrimitiveType(); |