diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-26 12:46:02 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-26 12:47:51 -0700 |
| commit | 0f055d11096cb02563e9c040cd03c791fd8f69a3 (patch) | |
| tree | 8c7e730f17174ab4e11786fde1c2a05c7039d507 /runtime/interpreter/interpreter.cc | |
| parent | 93c3396f8b33539489763ebdfafcedb4127009d9 (diff) | |
| parent | 7934ac288acfb2552bb0b06ec1f61e5820d924a4 (diff) | |
| download | art-0f055d11096cb02563e9c040cd03c791fd8f69a3.zip art-0f055d11096cb02563e9c040cd03c791fd8f69a3.tar.gz art-0f055d11096cb02563e9c040cd03c791fd8f69a3.tar.bz2 | |
resolved conflicts for merge of 7934ac28 to dalvik-dev
Change-Id: I8798a6f154463d3f92f6aca62f14130aec82d273
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 57e9dbf..d649d2a 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -74,7 +74,7 @@ static void UnstartedRuntimeInvoke(Thread* self, MethodHelper& mh, std::string name(PrettyMethod(shadow_frame->GetMethod())); if (name == "java.lang.Class java.lang.Class.forName(java.lang.String)") { std::string descriptor(DotToDescriptor(shadow_frame->GetVRegReference(arg_offset)->AsString()->ToModifiedUtf8().c_str())); - ClassLoader* class_loader = NULL; // shadow_frame.GetMethod()->GetDeclaringClass()->GetClassLoader(); + ClassLoader* class_loader = NULL; // shadow_frame.GetMethod()->GetDeclaringClass()->GetClassLoader(); Class* found = Runtime::Current()->GetClassLinker()->FindClass(descriptor.c_str(), class_loader); CHECK(found != NULL) << "Class.forName failed in un-started runtime for class: " @@ -659,7 +659,7 @@ static inline void DoIGetQuick(Thread* self, ShadowFrame& shadow_frame, return; } MemberOffset field_offset(inst->VRegC_22c()); - const bool is_volatile = false; // iget-x-quick only on non volatile fields. + const bool is_volatile = false; // iget-x-quick only on non volatile fields. const uint32_t vregA = inst->VRegA_22c(); switch (field_type) { case Primitive::kPrimInt: @@ -752,7 +752,7 @@ static inline void DoIPutQuick(Thread* self, ShadowFrame& shadow_frame, return; } MemberOffset field_offset(inst->VRegC_22c()); - const bool is_volatile = false; // iput-x-quick only on non volatile fields. + const bool is_volatile = false; // iput-x-quick only on non volatile fields. const uint32_t vregA = inst->VRegA_22c(); switch (field_type) { case Primitive::kPrimInt: |