diff options
author | Ian Rogers <irogers@google.com> | 2014-08-12 02:30:58 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-08-12 16:08:05 -0700 |
commit | 1ff3c98775a4577cf053dba9a0c2d5c21c07b298 (patch) | |
tree | 2d09c27c69678b53b4c9dc486024f3547efd4bca /runtime/reflection.cc | |
parent | 99c251bbd225dd97d0deece29559a430b12a0b66 (diff) | |
download | art-1ff3c98775a4577cf053dba9a0c2d5c21c07b298.tar.gz art-1ff3c98775a4577cf053dba9a0c2d5c21c07b298.tar.bz2 art-1ff3c98775a4577cf053dba9a0c2d5c21c07b298.zip |
Avoid use of std::string where we have const char*.
Removing the ClassHelper caused std::string creation for all calls to
Class::GetDescriptor and a significant performance regression. Make the
std::string an out argument so the caller can maintain it and its life time
while allowing GetDescriptor to return the common const char* case.
Don't generate GC maps when compilation is disabled.
Remove other uses of std::string that are occuring on critical paths.
Use the cheaper SkipClass in CompileMethod in CompilerDriver.
Specialize the utf8 as utf16 comparison code for the common shorter byte
encoding.
Force a bit of inlining, remove some UNLIKELYs (they are prone to pessimizing
code), add some LIKELYs.
x86-64 host 1-thread interpret-only of 57 apks:
Before: 29.539s
After: 23.467s
Regular compile:
Before: 1m35.347s
After: 1m20.056s
Bug: 16853450
Change-Id: Ic705ea24784bee24ab80084d06174cbf87d557ad
Diffstat (limited to 'runtime/reflection.cc')
-rw-r--r-- | runtime/reflection.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/runtime/reflection.cc b/runtime/reflection.cc index 0169cccbf0..cc50961322 100644 --- a/runtime/reflection.cc +++ b/runtime/reflection.cc @@ -211,11 +211,11 @@ class ArgArray { } static void ThrowIllegalPrimitiveArgumentException(const char* expected, - const StringPiece& found_descriptor) + const char* found_descriptor) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { ThrowIllegalArgumentException(nullptr, StringPrintf("Invalid primitive conversion from %s to %s", expected, - PrettyDescriptor(found_descriptor.as_string()).c_str()).c_str()); + PrettyDescriptor(found_descriptor).c_str()).c_str()); } bool BuildArgArrayFromObjectArray(const ScopedObjectAccessAlreadyRunnable& soa, @@ -257,8 +257,9 @@ class ArgArray { #define DO_FAIL(expected) \ } else { \ if (arg->GetClass<>()->IsPrimitive()) { \ + std::string temp; \ ThrowIllegalPrimitiveArgumentException(expected, \ - arg->GetClass<>()->GetDescriptor().c_str()); \ + arg->GetClass<>()->GetDescriptor(&temp)); \ } else { \ ThrowIllegalArgumentException(nullptr, \ StringPrintf("method %s argument %zd has type %s, got %s", \ @@ -815,11 +816,11 @@ static bool UnboxPrimitive(const ThrowLocation* throw_location, mirror::Object* src_class = class_linker->FindPrimitiveClass('S'); boxed_value.SetS(primitive_field->GetShort(o)); } else { + std::string temp; ThrowIllegalArgumentException(throw_location, - StringPrintf("%s has type %s, got %s", - UnboxingFailureKind(f).c_str(), - PrettyDescriptor(dst_class).c_str(), - PrettyDescriptor(o->GetClass()->GetDescriptor()).c_str()).c_str()); + StringPrintf("%s has type %s, got %s", UnboxingFailureKind(f).c_str(), + PrettyDescriptor(dst_class).c_str(), + PrettyDescriptor(o->GetClass()->GetDescriptor(&temp)).c_str()).c_str()); return false; } |